Skip to content

Commit

Permalink
Fix spurious 'value moved here in previous iteration of loop' messages
Browse files Browse the repository at this point in the history
Fixes #46099

Previously, we would check the 'move' and 'use' spans to see if we
should emit this message. However, this can give false positives when
macros are involved, since two distinct expressions may end up with the
same span.

Instead, we check the actual MIR `Location`, which eliminates false
positives.
  • Loading branch information
Aaron1011 committed Jun 22, 2020
1 parent 1a4e2b6 commit 953104e
Show file tree
Hide file tree
Showing 4 changed files with 34 additions and 2 deletions.
Expand Up @@ -139,7 +139,7 @@ impl<'cx, 'tcx> MirBorrowckCtxt<'cx, 'tcx> {

let move_msg = if move_spans.for_closure() { " into closure" } else { "" };

if span == move_span {
if location == move_out.source {
err.span_label(
span,
format!("value moved{} here, in previous iteration of loop", move_msg),
Expand Down
15 changes: 15 additions & 0 deletions src/test/ui/moves/issue-46099-move-in-macro.rs
@@ -0,0 +1,15 @@
// Regression test for issue #46099
// Tests that we don't emit spurious
// 'value moved in previous iteration of loop' message

macro_rules! test {
($v:expr) => {{
drop(&$v);
$v
}}
}

fn main() {
let b = Box::new(true);
test!({b}); //~ ERROR use of moved value
}
14 changes: 14 additions & 0 deletions src/test/ui/moves/issue-46099-move-in-macro.stderr
@@ -0,0 +1,14 @@
error[E0382]: use of moved value: `b`
--> $DIR/issue-46099-move-in-macro.rs:14:12
|
LL | let b = Box::new(true);
| - move occurs because `b` has type `std::boxed::Box<bool>`, which does not implement the `Copy` trait
LL | test!({b});
| ^
| |
| value moved here
| value used here after move

error: aborting due to previous error

For more information about this error, try `rustc --explain E0382`.
5 changes: 4 additions & 1 deletion src/test/ui/moves/move-in-guard-2.stderr
Expand Up @@ -5,7 +5,10 @@ LL | let x: Box<_> = box 1;
| - move occurs because `x` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
...
LL | (_, 2) if take(x) => (),
| ^ value moved here, in previous iteration of loop
| ^
| |
| value moved here
| value used here after move

error: aborting due to previous error

Expand Down

0 comments on commit 953104e

Please sign in to comment.