mikros/rust
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

remove in_move

Browse Source
This commit is contained in:
Centri3 2023-06-11 04:49:09 -05:00
parent a495fa06de
commit 9bc5a146fd
1 changed files with 19 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
clippy_utils/src/qualify_min_const_fn.rs
View File

@ -135,9 +135,9 @@ fn check_rvalue<'tcx>(
match rvalue { match rvalue {
Rvalue::ThreadLocalRef(_) => Err((span, "cannot access thread local storage in const fn".into())), Rvalue::ThreadLocalRef(_) => Err((span, "cannot access thread local storage in const fn".into())),
Rvalue::Len(place) | Rvalue::Discriminant(place) | Rvalue::Ref(_, _, place) | Rvalue::AddressOf(_, place) => { Rvalue::Len(place) | Rvalue::Discriminant(place) | Rvalue::Ref(_, _, place) | Rvalue::AddressOf(_, place) => {
check_place(tcx, *place, span, body, false) check_place(tcx, *place, span, body)
}, },
Rvalue::CopyForDeref(place) => check_place(tcx, *place, span, body, false), Rvalue::CopyForDeref(place) => check_place(tcx, *place, span, body),
Rvalue::Repeat(operand, _) Rvalue::Repeat(operand, _)
| Rvalue::Use(operand) | Rvalue::Use(operand)
| Rvalue::Cast( | Rvalue::Cast(
@ -230,14 +230,14 @@ fn check_statement<'tcx>(
let span = statement.source_info.span; let span = statement.source_info.span;
match &statement.kind { match &statement.kind {
StatementKind::Assign(box (place, rval)) => { StatementKind::Assign(box (place, rval)) => {
check_place(tcx, *place, span, body, false)?; check_place(tcx, *place, span, body)?;
check_rvalue(tcx, body, def_id, rval, span) check_rvalue(tcx, body, def_id, rval, span)
}, },
StatementKind::FakeRead(box (_, place)) => check_place(tcx, *place, span, body, false), StatementKind::FakeRead(box (_, place)) => check_place(tcx, *place, span, body),
// just an assignment // just an assignment
StatementKind::SetDiscriminant { place, .. } | StatementKind::Deinit(place) => { StatementKind::SetDiscriminant { place, .. } | StatementKind::Deinit(place) => {
check_place(tcx, **place, span, body, false) check_place(tcx, **place, span, body)
}, },
StatementKind::Intrinsic(box NonDivergingIntrinsic::Assume(op)) => check_operand(tcx, op, span, body), StatementKind::Intrinsic(box NonDivergingIntrinsic::Assume(op)) => check_operand(tcx, op, span, body),
@ -263,8 +263,19 @@ fn check_statement<'tcx>(
fn check_operand<'tcx>(tcx: TyCtxt<'tcx>, operand: &Operand<'tcx>, span: Span, body: &Body<'tcx>) -> McfResult { fn check_operand<'tcx>(tcx: TyCtxt<'tcx>, operand: &Operand<'tcx>, span: Span, body: &Body<'tcx>) -> McfResult {
match operand { match operand {
Operand::Move(place) => check_place(tcx, *place, span, body, true), Operand::Move(place) => {
Operand::Copy(place) => check_place(tcx, *place, span, body, false), if !place.projection.as_ref().is_empty()
&& !is_ty_const_destruct(tcx, place.ty(&body.local_decls, tcx).ty, body)
{
return Err((
span,
"cannot drop locals with a non constant destructor in const fn".into(),
));
}
check_place(tcx, *place, span, body)
},
Operand::Copy(place) => check_place(tcx, *place, span, body),
Operand::Constant(c) => match c.check_static_ptr(tcx) { Operand::Constant(c) => match c.check_static_ptr(tcx) {
Some(_) => Err((span, "cannot access `static` items in const fn".into())), Some(_) => Err((span, "cannot access `static` items in const fn".into())),
None => Ok(()), None => Ok(()),
@ -272,20 +283,9 @@ fn check_operand<'tcx>(tcx: TyCtxt<'tcx>, operand: &Operand<'tcx>, span: Span, b
} }
} }
fn check_place<'tcx>(tcx: TyCtxt<'tcx>, place: Place<'tcx>, span: Span, body: &Body<'tcx>, in_move: bool) -> McfResult { fn check_place<'tcx>(tcx: TyCtxt<'tcx>, place: Place<'tcx>, span: Span, body: &Body<'tcx>) -> McfResult {
let mut cursor = place.projection.as_ref(); let mut cursor = place.projection.as_ref();
if let [proj_base] = cursor
&& let ProjectionElem::Field(_, ty) = proj_base
&& !is_ty_const_destruct(tcx, *ty, body)
&& in_move
{
return Err((
span,
"cannot drop locals with a non constant destructor in const fn".into(),
));
}
while let [ref proj_base @ .., elem] = *cursor { while let [ref proj_base @ .., elem] = *cursor {
cursor = proj_base; cursor = proj_base;
match elem { match elem {