Skip to content

Commit a35cf79

Browse files
borsbors
committed
Auto merge of #56843 - csmoe:non-copy, r=davidtwco
Add a note describing the type of the non-Copy moved variable Closes #56654 r?@davidtwco
2 parents 5918318 + 48de0ff commit a35cf79

23 files changed

+94
-95
lines changed

‎src/librustc_mir/borrow_check/error_reporting.rs

+29-47
Original file line numberDiff line numberDiff line change
@@ -181,38 +181,36 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
181181
);
182182
}
183183

184-
if let Some(ty) = self.retrieve_type_for_place(used_place) {
185-
let needs_note = match ty.sty {
186-
ty::Closure(id, _) => {
187-
let tables = self.infcx.tcx.typeck_tables_of(id);
188-
let node_id = self.infcx.tcx.hir().as_local_node_id(id).unwrap();
189-
let hir_id = self.infcx.tcx.hir().node_to_hir_id(node_id);
190-
191-
tables.closure_kind_origins().get(hir_id).is_none()
192-
}
193-
_ => true,
194-
};
184+
let ty = used_place.ty(self.mir, self.infcx.tcx).to_ty(self.infcx.tcx);
185+
let needs_note = match ty.sty {
186+
ty::Closure(id, _) => {
187+
let tables = self.infcx.tcx.typeck_tables_of(id);
188+
let node_id = self.infcx.tcx.hir().as_local_node_id(id).unwrap();
189+
let hir_id = self.infcx.tcx.hir().node_to_hir_id(node_id);
195190

196-
if needs_note {
197-
let mpi = self.move_data.moves[move_out_indices[0]].path;
198-
let place = &self.move_data.move_paths[mpi].place;
199-
200-
if let Some(ty) = self.retrieve_type_for_place(place) {
201-
let note_msg = match self.describe_place_with_options(
202-
place,
203-
IncludingDowncast(true),
204-
) {
205-
Some(name) => format!("`{}`", name),
206-
None => "value".to_owned(),
207-
};
208-
209-
err.note(&format!(
210-
"move occurs because {} has type `{}`, \
211-
which does not implement the `Copy` trait",
212-
note_msg, ty
213-
));
214-
}
191+
tables.closure_kind_origins().get(hir_id).is_none()
215192
}
193+
_ => true,
194+
};
195+
196+
if needs_note {
197+
let mpi = self.move_data.moves[move_out_indices[0]].path;
198+
let place = &self.move_data.move_paths[mpi].place;
199+
200+
let ty = place.ty(self.mir, self.infcx.tcx).to_ty(self.infcx.tcx);
201+
let note_msg = match self.describe_place_with_options(
202+
place,
203+
IncludingDowncast(true),
204+
) {
205+
Some(name) => format!("`{}`", name),
206+
None => "value".to_owned(),
207+
};
208+
209+
err.note(&format!(
210+
"move occurs because {} has type `{}`, \
211+
which does not implement the `Copy` trait",
212+
note_msg, ty
213+
));
216214
}
217215

218216
if let Some((_, mut old_err)) = self.move_error_reported
@@ -1558,7 +1556,7 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
15581556
)?;
15591557
buf.push_str("[");
15601558
if self.append_local_to_string(index, buf).is_err() {
1561-
buf.push_str("..");
1559+
buf.push_str("_");
15621560
}
15631561
buf.push_str("]");
15641562
}
@@ -1663,22 +1661,6 @@ impl<'cx, 'gcx, 'tcx> MirBorrowckCtxt<'cx, 'gcx, 'tcx> {
16631661
}
16641662
}
16651663

1666-
/// Retrieve type of a place for the current MIR representation
1667-
fn retrieve_type_for_place(&self, place: &Place<'tcx>) -> Option<ty::Ty> {
1668-
match place {
1669-
Place::Local(local) => {
1670-
let local = &self.mir.local_decls[*local];
1671-
Some(local.ty)
1672-
}
1673-
Place::Promoted(ref prom) => Some(prom.1),
1674-
Place::Static(ref st) => Some(st.ty),
1675-
Place::Projection(ref proj) => match proj.elem {
1676-
ProjectionElem::Field(_, ty) => Some(ty),
1677-
_ => None,
1678-
},
1679-
}
1680-
}
1681-
16821664
/// Check if a place is a thread-local static.
16831665
pub fn is_place_thread_local(&self, place: &Place<'tcx>) -> bool {
16841666
if let Place::Static(statik) = place {

‎src/test/ui/borrowck/borrowck-describe-lvalue.ast.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ LL | v[0].y;
316316
LL | drop(x);
317317
| - borrow later used here
318318

319-
error[E0503]: cannot use `v[..].y` because it was mutably borrowed
319+
error[E0503]: cannot use `v[_].y` because it was mutably borrowed
320320
--> $DIR/borrowck-describe-lvalue.rs:261:9
321321
|
322322
LL | let x = &mut v;

‎src/test/ui/borrowck/borrowck-describe-lvalue.mir.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -316,7 +316,7 @@ LL | v[0].y;
316316
LL | drop(x);
317317
| - borrow later used here
318318

319-
error[E0503]: cannot use `v[..].y` because it was mutably borrowed
319+
error[E0503]: cannot use `v[_].y` because it was mutably borrowed
320320
--> $DIR/borrowck-describe-lvalue.rs:261:9
321321
|
322322
LL | let x = &mut v;

‎src/test/ui/borrowck/borrowck-describe-lvalue.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -260,7 +260,7 @@ fn main() {
260260
let x = &mut v;
261261
v[0].y;
262262
//[ast]~^ ERROR cannot use `v[..].y` because it was mutably borrowed
263-
//[mir]~^^ ERROR cannot use `v[..].y` because it was mutably borrowed
263+
//[mir]~^^ ERROR cannot use `v[_].y` because it was mutably borrowed
264264
//[mir]~| ERROR cannot use `*v` because it was mutably borrowed
265265
drop(x);
266266
}

‎src/test/ui/borrowck/borrowck-field-sensitivity.nll.stderr

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ LL | drop(x.b);
55
| --- value moved here
66
LL | drop(*x.b); //~ ERROR use of moved value: `*x.b`
77
| ^^^^ value used here after move
8+
|
9+
= note: move occurs because `x.b` has type `std::boxed::Box<isize>`, which does not implement the `Copy` trait
810

911
error[E0382]: use of moved value: `x.b`
1012
--> $DIR/borrowck-field-sensitivity.rs:14:10
@@ -13,6 +15,8 @@ LL | let y = A { a: 3, .. x };
1315
| ---------------- value moved here
1416
LL | drop(*x.b); //~ ERROR use of moved value: `*x.b`
1517
| ^^^^ value used here after move
18+
|
19+
= note: move occurs because `x.b` has type `std::boxed::Box<isize>`, which does not implement the `Copy` trait
1620

1721
error[E0382]: borrow of moved value: `x.b`
1822
--> $DIR/borrowck-field-sensitivity.rs:20:13

‎src/test/ui/borrowck/borrowck-move-out-from-array.ast.nll.stderr

-19
This file was deleted.

‎src/test/ui/borrowck/borrowck-move-out-from-array.mir.stderr

+4
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ LL | let [_, _x] = a;
55
| -- value moved here
66
LL | let [.., _y] = a; //[ast]~ ERROR [E0382]
77
| ^^ value used here after move
8+
|
9+
= note: move occurs because `a[..]` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
810

911
error[E0382]: use of moved value: `a[..]`
1012
--> $DIR/borrowck-move-out-from-array.rs:17:10
@@ -13,6 +15,8 @@ LL | let [_x, _] = a;
1315
| -- value moved here
1416
LL | let [_y..] = a; //[ast]~ ERROR [E0382]
1517
| ^^ value used here after move
18+
|
19+
= note: move occurs because `a[..]` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
1620

1721
error: aborting due to 2 previous errors
1822

‎src/test/ui/borrowck/borrowck-vec-pattern-move-tail.ast.nll.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,11 @@
1-
error[E0506]: cannot assign to `a[..]` because it is borrowed
1+
error[E0506]: cannot assign to `a[_]` because it is borrowed
22
--> $DIR/borrowck-vec-pattern-move-tail.rs:16:5
33
|
44
LL | [1, 2, ref tail..] => tail,
5-
| -------- borrow of `a[..]` occurs here
5+
| -------- borrow of `a[_]` occurs here
66
...
77
LL | a[2] = 0; //[ast]~ ERROR cannot assign to `a[..]` because it is borrowed
8-
| ^^^^^^^^ assignment to borrowed `a[..]` occurs here
8+
| ^^^^^^^^ assignment to borrowed `a[_]` occurs here
99
...
1010
LL | println!("t[0]: {}", t[0]);
1111
| ---- borrow later used here

‎src/test/ui/borrowck/borrowck-vec-pattern-move-tail.cmp.stderr

+3-3
Original file line numberDiff line numberDiff line change
@@ -7,14 +7,14 @@ LL | [1, 2, ref tail..] => tail,
77
LL | a[2] = 0; //[ast]~ ERROR cannot assign to `a[..]` because it is borrowed
88
| ^^^^^^^^ assignment to borrowed `a[..]` occurs here
99

10-
error[E0506]: cannot assign to `a[..]` because it is borrowed (Mir)
10+
error[E0506]: cannot assign to `a[_]` because it is borrowed (Mir)
1111
--> $DIR/borrowck-vec-pattern-move-tail.rs:16:5
1212
|
1313
LL | [1, 2, ref tail..] => tail,
14-
| -------- borrow of `a[..]` occurs here
14+
| -------- borrow of `a[_]` occurs here
1515
...
1616
LL | a[2] = 0; //[ast]~ ERROR cannot assign to `a[..]` because it is borrowed
17-
| ^^^^^^^^ assignment to borrowed `a[..]` occurs here
17+
| ^^^^^^^^ assignment to borrowed `a[_]` occurs here
1818
...
1919
LL | println!("t[0]: {}", t[0]);
2020
| ---- borrow later used here

‎src/test/ui/borrowck/borrowck-vec-pattern-move-tail.rs

+1-1
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ fn main() {
1515
println!("t[0]: {}", t[0]);
1616
a[2] = 0; //[ast]~ ERROR cannot assign to `a[..]` because it is borrowed
1717
//[cmp]~^ ERROR cannot assign to `a[..]` because it is borrowed (Ast)
18-
//[cmp]~| ERROR cannot assign to `a[..]` because it is borrowed (Mir)
18+
//[cmp]~| ERROR cannot assign to `a[_]` because it is borrowed (Mir)
1919
println!("t[0]: {}", t[0]);
2020
t[0];
2121
}

‎src/test/ui/borrowck/borrowck-vec-pattern-nesting.nll.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
error[E0506]: cannot assign to `vec[..]` because it is borrowed
1+
error[E0506]: cannot assign to `vec[_]` because it is borrowed
22
--> $DIR/borrowck-vec-pattern-nesting.rs:10:13
33
|
44
LL | [box ref _a, _, _] => {
5-
| ------ borrow of `vec[..]` occurs here
5+
| ------ borrow of `vec[_]` occurs here
66
LL | //~^ borrow of `vec[..]` occurs here
77
LL | vec[0] = box 4; //~ ERROR cannot assign
8-
| ^^^^^^ assignment to borrowed `vec[..]` occurs here
8+
| ^^^^^^ assignment to borrowed `vec[_]` occurs here
99
LL | //~^ assignment to borrowed `vec[..]` occurs here
1010
LL | _a.use_ref();
1111
| -- borrow later used here
1212

13-
error[E0506]: cannot assign to `vec[..]` because it is borrowed
13+
error[E0506]: cannot assign to `vec[_]` because it is borrowed
1414
--> $DIR/borrowck-vec-pattern-nesting.rs:23:13
1515
|
1616
LL | &mut [ref _b..] => {
17-
| ------ borrow of `vec[..]` occurs here
17+
| ------ borrow of `vec[_]` occurs here
1818
LL | //~^ borrow of `vec[..]` occurs here
1919
LL | vec[0] = box 4; //~ ERROR cannot assign
20-
| ^^^^^^ assignment to borrowed `vec[..]` occurs here
20+
| ^^^^^^ assignment to borrowed `vec[_]` occurs here
2121
LL | //~^ assignment to borrowed `vec[..]` occurs here
2222
LL | _b.use_ref();
2323
| -- borrow later used here

‎src/test/ui/borrowck/two-phase-nonrecv-autoref.ast.nll.stderr

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ LL | f(f(10));
1414
| - ^ value used here after move
1515
| |
1616
| value moved here
17+
|
18+
= note: move occurs because `*f` has type `F`, which does not implement the `Copy` trait
1719

1820
error[E0499]: cannot borrow `*f` as mutable more than once at a time
1921
--> $DIR/two-phase-nonrecv-autoref.rs:76:11
@@ -43,6 +45,8 @@ LL | f(f(10));
4345
| - ^ value used here after move
4446
| |
4547
| value moved here
48+
|
49+
= note: move occurs because `*f` has type `dyn std::ops::FnOnce(i32) -> i32`, which does not implement the `Copy` trait
4650

4751
error[E0502]: cannot borrow `a` as immutable because it is also borrowed as mutable
4852
--> $DIR/two-phase-nonrecv-autoref.rs:129:27

‎src/test/ui/borrowck/two-phase-nonrecv-autoref.nll.stderr

+4
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,8 @@ LL | f(f(10));
1414
| - ^ value used here after move
1515
| |
1616
| value moved here
17+
|
18+
= note: move occurs because `*f` has type `F`, which does not implement the `Copy` trait
1719

1820
error[E0499]: cannot borrow `*f` as mutable more than once at a time
1921
--> $DIR/two-phase-nonrecv-autoref.rs:76:11
@@ -43,6 +45,8 @@ LL | f(f(10));
4345
| - ^ value used here after move
4446
| |
4547
| value moved here
48+
|
49+
= note: move occurs because `*f` has type `dyn std::ops::FnOnce(i32) -> i32`, which does not implement the `Copy` trait
4650

4751
error[E0502]: cannot borrow `a` as immutable because it is also borrowed as mutable
4852
--> $DIR/two-phase-nonrecv-autoref.rs:129:27

‎src/test/ui/issues/issue-27282-move-match-input-into-guard.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,8 @@ LL | _ if { (|| { let bar = b; *bar = false; })();
88
LL | false } => { },
99
LL | &mut true => { println!("You might think we should get here"); },
1010
| ^^^^ value used here after move
11+
|
12+
= note: move occurs because `b` has type `&mut bool`, which does not implement the `Copy` trait
1113

1214
error: aborting due to previous error
1315

‎src/test/ui/issues/issue-42344.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
error[E0596]: cannot borrow `*TAB[..]` as mutable, as `TAB` is an immutable static item
1+
error[E0596]: cannot borrow `*TAB[_]` as mutable, as `TAB` is an immutable static item
22
--> $DIR/issue-42344.rs:4:5
33
|
44
LL | TAB[0].iter_mut(); //~ ERROR cannot borrow data mutably in a `&` reference [E0389]

‎src/test/ui/issues/issue-46604.ast.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0017]: references in statics may only refer to immutable values
44
LL | static buf: &mut [u8] = &mut [1u8,2,3,4,5,7]; //[ast]~ ERROR E0017
55
| ^^^^^^^^^^^^^^^^^^^^ statics require immutable values
66

7-
error[E0594]: cannot assign to `buf[..]`, as `buf` is an immutable static item
7+
error[E0594]: cannot assign to `buf[_]`, as `buf` is an immutable static item
88
--> $DIR/issue-46604.rs:10:5
99
|
1010
LL | buf[0]=2; //[ast]~ ERROR E0389

‎src/test/ui/issues/issue-46604.mir.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0017]: references in statics may only refer to immutable values
44
LL | static buf: &mut [u8] = &mut [1u8,2,3,4,5,7]; //[ast]~ ERROR E0017
55
| ^^^^^^^^^^^^^^^^^^^^ statics require immutable values
66

7-
error[E0594]: cannot assign to `buf[..]`, as `buf` is an immutable static item
7+
error[E0594]: cannot assign to `buf[_]`, as `buf` is an immutable static item
88
--> $DIR/issue-46604.rs:10:5
99
|
1010
LL | buf[0]=2; //[ast]~ ERROR E0389

‎src/test/ui/liveness/liveness-use-after-move.nll.stderr

+2
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,8 @@ LL | let y = x;
55
| - value moved here
66
LL | println!("{}", *x); //~ ERROR use of moved value: `*x`
77
| ^^ value borrowed here after move
8+
|
9+
= note: move occurs because `x` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
810

911
error: aborting due to previous error
1012

‎src/test/ui/nll/drop-no-may-dangle.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -17,10 +17,10 @@ fn main() {
1717
use_x(*p.value);
1818
} else {
1919
use_x(22);
20-
v[0] += 1; //~ ERROR cannot assign to `v[..]` because it is borrowed
20+
v[0] += 1; //~ ERROR cannot assign to `v[_]` because it is borrowed
2121
}
2222

23-
v[0] += 1; //~ ERROR cannot assign to `v[..]` because it is borrowed
23+
v[0] += 1; //~ ERROR cannot assign to `v[_]` because it is borrowed
2424
}
2525

2626
struct WrapMayNotDangle<T> {

‎src/test/ui/nll/drop-no-may-dangle.stderr

+8-8
Original file line numberDiff line numberDiff line change
@@ -1,23 +1,23 @@
1-
error[E0506]: cannot assign to `v[..]` because it is borrowed
1+
error[E0506]: cannot assign to `v[_]` because it is borrowed
22
--> $DIR/drop-no-may-dangle.rs:20:9
33
|
44
LL | let p: WrapMayNotDangle<&usize> = WrapMayNotDangle { value: &v[0] };
5-
| ----- borrow of `v[..]` occurs here
5+
| ----- borrow of `v[_]` occurs here
66
...
7-
LL | v[0] += 1; //~ ERROR cannot assign to `v[..]` because it is borrowed
8-
| ^^^^^^^^^ assignment to borrowed `v[..]` occurs here
7+
LL | v[0] += 1; //~ ERROR cannot assign to `v[_]` because it is borrowed
8+
| ^^^^^^^^^ assignment to borrowed `v[_]` occurs here
99
...
1010
LL | }
1111
| - borrow might be used here, when `p` is dropped and runs the `Drop` code for type `WrapMayNotDangle`
1212

13-
error[E0506]: cannot assign to `v[..]` because it is borrowed
13+
error[E0506]: cannot assign to `v[_]` because it is borrowed
1414
--> $DIR/drop-no-may-dangle.rs:23:5
1515
|
1616
LL | let p: WrapMayNotDangle<&usize> = WrapMayNotDangle { value: &v[0] };
17-
| ----- borrow of `v[..]` occurs here
17+
| ----- borrow of `v[_]` occurs here
1818
...
19-
LL | v[0] += 1; //~ ERROR cannot assign to `v[..]` because it is borrowed
20-
| ^^^^^^^^^ assignment to borrowed `v[..]` occurs here
19+
LL | v[0] += 1; //~ ERROR cannot assign to `v[_]` because it is borrowed
20+
| ^^^^^^^^^ assignment to borrowed `v[_]` occurs here
2121
LL | }
2222
| - borrow might be used here, when `p` is dropped and runs the `Drop` code for type `WrapMayNotDangle`
2323

0 commit comments

Comments
 (0)