Skip to content

Commit 3242880

Browse files
borsbors
committed
Auto merge of #49861 - pnkfelix:compare-mode-nll-followup-2, r=nikomatsakis
Blindly checkpoint status of NLL mode ui tests This takes the next (and potentially final?) step with #48879. Namely, this PR got things to the point where I can successfully run `compiletest` on `src/test/ui` with `--compile-mode=nll`. Here are the main pieces of it: 1. To figure out how to even run `compiletest` normally on the ui directory, I ran `x.py test -vv`, and then looked for the `compiletest` invocation that mentioned `src/test/ui`. 2. I took the aforementioned `compiletest` invocation and used it, adding `--compile-mode=nll` to the end. It had 170 failing cases. 3. Due to #49855, I had to edit some of the tests so that they fail even under NLL, via `#[rustc_error]`. That's the first commit. (Then goto 2 to double-check no such tests remain.) 4. I took the generated `build/target/test/foo.stderr` file for every case that failed, and blindly copied it to `src/test/foo.nll.stderr`. That's the second commit. 5. Goto 2 until there were no failing cases. 6. Remove any stamp files, and re-run `x.py test` to make sure that the edits and new `.nll.stderr` files haven't broken the pre-existing test suite.
2 parents ca26ef3 + 746d63a commit 3242880

File tree

198 files changed

+3626
-56
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

198 files changed

+3626
-56
lines changed

‎src/test/ui/augmented-assignments.nll.stderr

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
error[E0505]: cannot move out of `x` because it is borrowed
2+
--> $DIR/augmented-assignments.rs:26:5
3+
|
4+
LL | x //~ error: use of moved value: `x`
5+
| -
6+
| |
7+
| _____borrow of `x` occurs here
8+
| |
9+
LL | | //~^ value used here after move
10+
LL | | +=
11+
LL | | x; //~ value moved here
12+
| | -
13+
| | |
14+
| |_____move out of `x` occurs here
15+
| borrow later used here
16+
17+
error[E0596]: cannot borrow immutable item `y` as mutable
18+
--> $DIR/augmented-assignments.rs:30:5
19+
|
20+
LL | y //~ error: cannot borrow immutable local variable `y` as mutable
21+
| ^ cannot borrow as mutable
22+
23+
error: aborting due to 2 previous errors
24+
25+
Some errors occurred: E0505, E0596.
26+
For more information about an error, try `rustc --explain E0505`.

‎src/test/ui/borrowck/borrowck-box-insensitivity.nll.stderr

+25
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
error[E0382]: use of moved value: `a.y`
2+
--> $DIR/borrowck-box-insensitivity.rs:46:14
3+
|
4+
LL | let _x = a.x;
5+
| --- value moved here
6+
LL | //~^ value moved here
7+
LL | let _y = a.y; //~ ERROR use of moved
8+
| ^^^ value used here after move
9+
|
10+
= note: move occurs because `a.y` has type `std::boxed::Box<isize>`, which does not implement the `Copy` trait
11+
12+
error[E0382]: use of moved value: `a.y`
13+
--> $DIR/borrowck-box-insensitivity.rs:108:14
14+
|
15+
LL | let _x = a.x.x;
16+
| ----- value moved here
17+
LL | //~^ value moved here
18+
LL | let _y = a.y; //~ ERROR use of collaterally moved
19+
| ^^^ value used here after move
20+
|
21+
= note: move occurs because `a.y` has type `std::boxed::Box<isize>`, which does not implement the `Copy` trait
22+
23+
error: aborting due to 2 previous errors
24+
25+
For more information about this error, try `rustc --explain E0382`.

‎src/test/ui/borrowck/borrowck-closures-two-mut.nll.stderr

+78
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,78 @@
1+
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
2+
--> $DIR/borrowck-closures-two-mut.rs:24:24
3+
|
4+
LL | let c1 = to_fn_mut(|| x = 4);
5+
| -- - previous borrow occurs due to use of `x` in closure
6+
| |
7+
| first mutable borrow occurs here
8+
LL | let c2 = to_fn_mut(|| x = 5); //~ ERROR cannot borrow `x` as mutable more than once
9+
| ^^ - borrow occurs due to use of `x` in closure
10+
| |
11+
| second mutable borrow occurs here
12+
LL | //~| ERROR cannot borrow `x` as mutable more than once
13+
LL | }
14+
| - first borrow ends here
15+
16+
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
17+
--> $DIR/borrowck-closures-two-mut.rs:35:24
18+
|
19+
LL | let c1 = to_fn_mut(|| set(&mut x));
20+
| -- - previous borrow occurs due to use of `x` in closure
21+
| |
22+
| first mutable borrow occurs here
23+
LL | let c2 = to_fn_mut(|| set(&mut x)); //~ ERROR cannot borrow `x` as mutable more than once
24+
| ^^ - borrow occurs due to use of `x` in closure
25+
| |
26+
| second mutable borrow occurs here
27+
LL | //~| ERROR cannot borrow `x` as mutable more than once
28+
LL | }
29+
| - first borrow ends here
30+
31+
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
32+
--> $DIR/borrowck-closures-two-mut.rs:42:24
33+
|
34+
LL | let c1 = to_fn_mut(|| x = 5);
35+
| -- - previous borrow occurs due to use of `x` in closure
36+
| |
37+
| first mutable borrow occurs here
38+
LL | let c2 = to_fn_mut(|| set(&mut x)); //~ ERROR cannot borrow `x` as mutable more than once
39+
| ^^ - borrow occurs due to use of `x` in closure
40+
| |
41+
| second mutable borrow occurs here
42+
LL | //~| ERROR cannot borrow `x` as mutable more than once
43+
LL | }
44+
| - first borrow ends here
45+
46+
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
47+
--> $DIR/borrowck-closures-two-mut.rs:49:24
48+
|
49+
LL | let c1 = to_fn_mut(|| x = 5);
50+
| -- - previous borrow occurs due to use of `x` in closure
51+
| |
52+
| first mutable borrow occurs here
53+
LL | let c2 = to_fn_mut(|| { let _y = to_fn_mut(|| set(&mut x)); }); // (nested closure)
54+
| ^^ - borrow occurs due to use of `x` in closure
55+
| |
56+
| second mutable borrow occurs here
57+
...
58+
LL | }
59+
| - first borrow ends here
60+
61+
error[E0499]: cannot borrow `x` as mutable more than once at a time (Ast)
62+
--> $DIR/borrowck-closures-two-mut.rs:61:24
63+
|
64+
LL | let c1 = to_fn_mut(|| set(&mut *x.f));
65+
| -- - previous borrow occurs due to use of `x` in closure
66+
| |
67+
| first mutable borrow occurs here
68+
LL | let c2 = to_fn_mut(|| set(&mut *x.f));
69+
| ^^ - borrow occurs due to use of `x` in closure
70+
| |
71+
| second mutable borrow occurs here
72+
...
73+
LL | }
74+
| - first borrow ends here
75+
76+
error: aborting due to 5 previous errors
77+
78+
For more information about this error, try `rustc --explain E0499`.

‎src/test/ui/borrowck/borrowck-escaping-closure-error-1.nll.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error[E0597]: `books` does not live long enough
2+
--> $DIR/borrowck-escaping-closure-error-1.rs:23:11
3+
|
4+
LL | spawn(|| books.push(4));
5+
| ^^^^^^^^^^^^^^^^ borrowed value does not live long enough
6+
LL | //~^ ERROR E0373
7+
LL | }
8+
| - borrowed value only lives until here
9+
|
10+
= note: borrowed value must be valid for the static lifetime...
11+
12+
error: aborting due to previous error
13+
14+
For more information about this error, try `rustc --explain E0597`.

‎src/test/ui/borrowck/borrowck-escaping-closure-error-2.nll.stderr

+18
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,18 @@
1+
error[E0597]: `books` does not live long enough
2+
--> $DIR/borrowck-escaping-closure-error-2.rs:21:14
3+
|
4+
LL | Box::new(|| books.push(4))
5+
| ^^^^^^^^^^^^^^^^ borrowed value does not live long enough
6+
LL | //~^ ERROR E0373
7+
LL | }
8+
| - borrowed value only lives until here
9+
|
10+
note: borrowed value must be valid for the lifetime 'a as defined on the function body at 19:1...
11+
--> $DIR/borrowck-escaping-closure-error-2.rs:19:1
12+
|
13+
LL | fn foo<'a>(x: &'a i32) -> Box<FnMut()+'a> {
14+
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
15+
16+
error: aborting due to previous error
17+
18+
For more information about this error, try `rustc --explain E0597`.

‎src/test/ui/borrowck/borrowck-in-static.nll.stderr

+9
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
error[E0507]: cannot move out of borrowed content
2+
--> $DIR/borrowck-in-static.rs:15:17
3+
|
4+
LL | Box::new(|| x) //~ ERROR cannot move out of captured outer variable
5+
| ^ cannot move out of borrowed content
6+
7+
error: aborting due to previous error
8+
9+
For more information about this error, try `rustc --explain E0507`.

‎src/test/ui/borrowck/borrowck-move-error-with-note.nll.stderr

+40
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,40 @@
1+
error[E0507]: cannot move out of borrowed content
2+
--> $DIR/borrowck-move-error-with-note.rs:23:19
3+
|
4+
LL | Foo::Foo1(num1,
5+
| ^^^^ cannot move out of borrowed content
6+
7+
error[E0507]: cannot move out of borrowed content
8+
--> $DIR/borrowck-move-error-with-note.rs:24:19
9+
|
10+
LL | num2) => (),
11+
| ^^^^ cannot move out of borrowed content
12+
13+
error[E0507]: cannot move out of borrowed content
14+
--> $DIR/borrowck-move-error-with-note.rs:25:19
15+
|
16+
LL | Foo::Foo2(num) => (),
17+
| ^^^ cannot move out of borrowed content
18+
19+
error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
20+
--> $DIR/borrowck-move-error-with-note.rs:42:16
21+
|
22+
LL | f: _s,
23+
| ^^ cannot move out of here
24+
25+
error[E0509]: cannot move out of type `S`, which implements the `Drop` trait
26+
--> $DIR/borrowck-move-error-with-note.rs:43:16
27+
|
28+
LL | g: _t
29+
| ^^ cannot move out of here
30+
31+
error[E0507]: cannot move out of borrowed content
32+
--> $DIR/borrowck-move-error-with-note.rs:59:9
33+
|
34+
LL | n => {
35+
| ^ cannot move out of borrowed content
36+
37+
error: aborting due to 6 previous errors
38+
39+
Some errors occurred: E0507, E0509.
40+
For more information about an error, try `rustc --explain E0507`.

‎src/test/ui/borrowck/borrowck-move-out-of-vec-tail.nll.stderr

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
error[E0507]: cannot move out of borrowed content
2+
--> $DIR/borrowck-move-out-of-vec-tail.rs:30:33
3+
|
4+
LL | &[Foo { string: a },
5+
| ^ cannot move out of borrowed content
6+
7+
error[E0507]: cannot move out of borrowed content
8+
--> $DIR/borrowck-move-out-of-vec-tail.rs:34:33
9+
|
10+
LL | Foo { string: b }] => {
11+
| ^ cannot move out of borrowed content
12+
13+
error: aborting due to 2 previous errors
14+
15+
For more information about this error, try `rustc --explain E0507`.

‎src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.nll.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: compilation successful
2+
--> $DIR/borrowck-report-with-custom-diagnostic.rs:12:1
3+
|
4+
LL | / fn main() { #![rustc_error] // rust-lang/rust#49855
5+
LL | | // Original borrow ends at end of function
6+
LL | | let mut x = 1;
7+
LL | | let y = &mut x;
8+
... |
9+
LL | | //~^ immutable borrow occurs here
10+
LL | | }
11+
| |_^
12+
13+
error: aborting due to previous error
14+

‎src/test/ui/borrowck/borrowck-report-with-custom-diagnostic.rs

+2-2
Original file line numberDiff line numberDiff line change
@@ -7,9 +7,9 @@
77
// <LICENSE-MIT or http://opensource.org/licenses/MIT>, at your
88
// option. This file may not be copied, modified, or distributed
99
// except according to those terms.
10-
10+
#![feature(rustc_attrs)]
1111
#![allow(dead_code)]
12-
fn main() {
12+
fn main() { #![rustc_error] // rust-lang/rust#49855
1313
// Original borrow ends at end of function
1414
let mut x = 1;
1515
let y = &mut x;

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

+51
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,51 @@
1+
error[E0507]: cannot move out of borrowed content
2+
--> $DIR/borrowck-vec-pattern-nesting.rs:42:15
3+
|
4+
LL | &mut [_a, //~ ERROR cannot move out
5+
| ^^ cannot move out of borrowed content
6+
7+
error[E0507]: cannot move out of borrowed content
8+
--> $DIR/borrowck-vec-pattern-nesting.rs:55:13
9+
|
10+
LL | let a = vec[0]; //~ ERROR cannot move out
11+
| ^^^^^^ cannot move out of borrowed content
12+
13+
error[E0507]: cannot move out of borrowed content
14+
--> $DIR/borrowck-vec-pattern-nesting.rs:65:10
15+
|
16+
LL | _b] => {}
17+
| ^^ cannot move out of borrowed content
18+
19+
error[E0507]: cannot move out of borrowed content
20+
--> $DIR/borrowck-vec-pattern-nesting.rs:68:13
21+
|
22+
LL | let a = vec[0]; //~ ERROR cannot move out
23+
| ^^^^^^ cannot move out of borrowed content
24+
25+
error[E0507]: cannot move out of borrowed content
26+
--> $DIR/borrowck-vec-pattern-nesting.rs:76:15
27+
|
28+
LL | &mut [_a, _b, _c] => {} //~ ERROR cannot move out
29+
| ^^ cannot move out of borrowed content
30+
31+
error[E0507]: cannot move out of borrowed content
32+
--> $DIR/borrowck-vec-pattern-nesting.rs:76:19
33+
|
34+
LL | &mut [_a, _b, _c] => {} //~ ERROR cannot move out
35+
| ^^ cannot move out of borrowed content
36+
37+
error[E0507]: cannot move out of borrowed content
38+
--> $DIR/borrowck-vec-pattern-nesting.rs:76:23
39+
|
40+
LL | &mut [_a, _b, _c] => {} //~ ERROR cannot move out
41+
| ^^ cannot move out of borrowed content
42+
43+
error[E0507]: cannot move out of borrowed content
44+
--> $DIR/borrowck-vec-pattern-nesting.rs:80:13
45+
|
46+
LL | let a = vec[0]; //~ ERROR cannot move out
47+
| ^^^^^^ cannot move out of borrowed content
48+
49+
error: aborting due to 8 previous errors
50+
51+
For more information about this error, try `rustc --explain E0507`.

‎src/test/ui/borrowck/issue-45983.nll.stderr

+30
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
warning: not reporting region error due to -Znll
2+
--> $DIR/issue-45983.rs:17:27
3+
|
4+
LL | give_any(|y| x = Some(y));
5+
| ^
6+
7+
error: free region `` does not outlive free region `'_#2r`
8+
--> $DIR/issue-45983.rs:17:27
9+
|
10+
LL | give_any(|y| x = Some(y));
11+
| ^
12+
13+
error[E0594]: cannot assign to immutable item `x`
14+
--> $DIR/issue-45983.rs:17:18
15+
|
16+
LL | give_any(|y| x = Some(y));
17+
| ^^^^^^^^^^^ cannot mutate
18+
|
19+
= note: Value not mutable causing this error: `x`
20+
21+
error[E0596]: cannot borrow immutable item `x` as mutable
22+
--> $DIR/issue-45983.rs:17:14
23+
|
24+
LL | give_any(|y| x = Some(y));
25+
| ^^^^^^^^^^^^^^^ cannot borrow as mutable
26+
27+
error: aborting due to 3 previous errors
28+
29+
Some errors occurred: E0594, E0596.
30+
For more information about an error, try `rustc --explain E0594`.

‎src/test/ui/borrowck/issue-7573.nll.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
warning: not reporting region error due to -Znll
2+
--> $DIR/issue-7573.rs:27:31
3+
|
4+
LL | let mut lines_to_use: Vec<&CrateId> = Vec::new();
5+
| ^
6+
7+
error: free region `` does not outlive free region `'_#2r`
8+
--> $DIR/issue-7573.rs:32:9
9+
|
10+
LL | lines_to_use.push(installed_id);
11+
| ^^^^^^^^^^^^
12+
13+
error: aborting due to previous error
14+

‎src/test/ui/borrowck/mut-borrow-in-loop.nll.stderr

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
error[E0499]: cannot borrow `*arg` as mutable more than once at a time
2+
--> $DIR/mut-borrow-in-loop.rs:20:25
3+
|
4+
LL | (self.func)(arg) //~ ERROR cannot borrow
5+
| ^^^ mutable borrow starts here in previous iteration of loop
6+
7+
error[E0499]: cannot borrow `*arg` as mutable more than once at a time
8+
--> $DIR/mut-borrow-in-loop.rs:26:25
9+
|
10+
LL | (self.func)(arg) //~ ERROR cannot borrow
11+
| ^^^ mutable borrow starts here in previous iteration of loop
12+
13+
error[E0499]: cannot borrow `*arg` as mutable more than once at a time
14+
--> $DIR/mut-borrow-in-loop.rs:33:25
15+
|
16+
LL | (self.func)(arg) //~ ERROR cannot borrow
17+
| ^^^ mutable borrow starts here in previous iteration of loop
18+
19+
error: aborting due to 3 previous errors
20+
21+
For more information about this error, try `rustc --explain E0499`.

‎src/test/ui/borrowck/mut-borrow-outside-loop.nll.stderr

+14
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
error: compilation successful
2+
--> $DIR/mut-borrow-outside-loop.rs:13:1
3+
|
4+
LL | / fn main() { #![rustc_error] // rust-lang/rust#49855
5+
LL | | let mut void = ();
6+
LL | |
7+
LL | | let first = &mut void;
8+
... |
9+
LL | | }
10+
LL | | }
11+
| |_^
12+
13+
error: aborting due to previous error
14+

0 commit comments

Comments
 (0)