Rollup merge of #45877 - mikhail-m1:mir-borrowck-act-on-moved, r=arielb1
restore move out dataflow, add report of move out errors fix https://github.com/rust-lang/rust/issues/45363 r? @arielb1
This commit is contained in:
commit
5d07d73ffb
7 changed files with 301 additions and 28 deletions
|
|
@ -19,6 +19,6 @@ fn main()
|
|||
match Some(42) {
|
||||
Some(_) if { drop(my_str); false } => {}
|
||||
Some(_) => {}
|
||||
None => { foo(my_str); } //~ ERROR (Mir) [E0381]
|
||||
None => { foo(my_str); } //~ ERROR (Mir) [E0382]
|
||||
}
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,11 +39,11 @@ fn main() {
|
|||
let _moved = line1.origin;
|
||||
let _ = line1.origin.x + 1; //[ast]~ ERROR use of collaterally moved value: `line1.origin.x`
|
||||
//[mir]~^ [E0382]
|
||||
//[mir]~| (Mir) [E0381]
|
||||
//[mir]~| (Mir) [E0382]
|
||||
|
||||
let mut line2 = Line::default();
|
||||
let _moved = (line2.origin, line2.middle);
|
||||
line2.consume(); //[ast]~ ERROR use of partially moved value: `line2` [E0382]
|
||||
//[mir]~^ [E0382]
|
||||
//[mir]~| (Mir) [E0381]
|
||||
//[mir]~| (Mir) [E0382]
|
||||
}
|
||||
|
|
|
|||
19
src/test/ui/borrowck/borrowck-reinit.rs
Normal file
19
src/test/ui/borrowck/borrowck-reinit.rs
Normal file
|
|
@ -0,0 +1,19 @@
|
|||
// Copyright 2015 The Rust Project Developers. See the COPYRIGHT
|
||||
// file at the top-level directory of this distribution and at
|
||||
// http://rust-lang.org/COPYRIGHT.
|
||||
//
|
||||
// Licensed under the Apache License, Version 2.0 <LICENSE-APACHE or
|
||||
// http://www.apache.org/licenses/LICENSE-2.0> or the MIT license
|
||||
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
|
||||
// option. This file may not be copied, modified, or distributed
|
||||
// except according to those terms.
|
||||
|
||||
// compile-flags: -Z borrowck-mir -Z emit-end-regions
|
||||
|
||||
fn main() {
|
||||
let mut x = Box::new(0);
|
||||
let _u = x; // error shouldn't note this move
|
||||
x = Box::new(1);
|
||||
drop(x);
|
||||
let _ = (1,x);
|
||||
}
|
||||
20
src/test/ui/borrowck/borrowck-reinit.stderr
Normal file
20
src/test/ui/borrowck/borrowck-reinit.stderr
Normal file
|
|
@ -0,0 +1,20 @@
|
|||
error[E0382]: use of moved value: `x` (Ast)
|
||||
--> $DIR/borrowck-reinit.rs:18:16
|
||||
|
|
||||
17 | drop(x);
|
||||
| - value moved here
|
||||
18 | let _ = (1,x);
|
||||
| ^ value used here after move
|
||||
|
|
||||
= note: move occurs because `x` has type `std::boxed::Box<i32>`, which does not implement the `Copy` trait
|
||||
|
||||
error[E0382]: use of moved value: `x` (Mir)
|
||||
--> $DIR/borrowck-reinit.rs:18:16
|
||||
|
|
||||
17 | drop(x);
|
||||
| - value moved here
|
||||
18 | let _ = (1,x);
|
||||
| ^ value use here after move
|
||||
|
||||
error: aborting due to 2 previous errors
|
||||
|
||||
Loading…
Add table
Add a link
Reference in a new issue