Skip to content

Commit cb6f9b2

Browse files
matthiaskrgrmatthiaskrgr
authored
Rollup merge of rust-lang#91087 - rukai:fix_test_nll_revisions, r=jackh726
Remove all migrate.nll.stderr files There are a few ui tests that setup the revisions like: ```rust // revisions: migrate nll` // [nll]compile-flags: -Zborrowck=mir ``` However most of them fail to disable the nll compare mode like this: ```rust // ignore-compare-mode-nll ``` This ends up generating confusing files ending in `.migrate.nll.stderr` because the nll compare mode is run on top of the migrate revision. This PR fixes this by adding `ignore-compare-mode-nll` to these tests. I would have just made these tests use compare modes instead but I assume the reason these tests are messing around with revisions instead of just letting the nll compare mode do its thing is to enforce error annotations for both migrate and nll. Relying on just compare modes would only have the error annotations for migrate.
2 parents dc50f13 + abd704b commit cb6f9b2

31 files changed

+115
-219
lines changed

‎src/test/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.migrate.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0594]: cannot assign to `x`, as it is not declared as mutable
2-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:19:46
2+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:17:46
33
|
44
LL | pub fn e(x: &'static mut isize) {
55
| - help: consider changing this to be mutable: `mut x`
@@ -8,7 +8,7 @@ LL | let mut c1 = |y: &'static mut isize| x = y;
88
| ^^^^^ cannot assign
99

1010
error[E0594]: cannot assign to `x`, as it is not declared as mutable
11-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:30:50
11+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:28:50
1212
|
1313
LL | pub fn ee(x: &'static mut isize) {
1414
| - help: consider changing this to be mutable: `mut x`
@@ -17,31 +17,31 @@ LL | let mut c2 = |y: &'static mut isize| x = y;
1717
| ^^^^^ cannot assign
1818

1919
error[E0594]: cannot assign to `x`, as it is not declared as mutable
20-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:42:14
20+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:40:14
2121
|
2222
LL | pub fn capture_assign_whole(x: (i32,)) {
2323
| - help: consider changing this to be mutable: `mut x`
2424
LL | || { x = (1,); };
2525
| ^^^^^^^^ cannot assign
2626

2727
error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable
28-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:47:14
28+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:45:14
2929
|
3030
LL | pub fn capture_assign_part(x: (i32,)) {
3131
| - help: consider changing this to be mutable: `mut x`
3232
LL | || { x.0 = 1; };
3333
| ^^^^^^^ cannot assign
3434

3535
error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
36-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:52:14
36+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:50:14
3737
|
3838
LL | pub fn capture_reborrow_whole(x: (i32,)) {
3939
| - help: consider changing this to be mutable: `mut x`
4040
LL | || { &mut x; };
4141
| ^^^^^^ cannot borrow as mutable
4242

4343
error[E0596]: cannot borrow `x.0` as mutable, as `x` is not declared as mutable
44-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:57:14
44+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:55:14
4545
|
4646
LL | pub fn capture_reborrow_part(x: (i32,)) {
4747
| - help: consider changing this to be mutable: `mut x`

‎src/test/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.nll.stderr

+6-6
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0594]: cannot assign to `x`, as it is not declared as mutable
2-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:19:46
2+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:17:46
33
|
44
LL | pub fn e(x: &'static mut isize) {
55
| - help: consider changing this to be mutable: `mut x`
@@ -8,7 +8,7 @@ LL | let mut c1 = |y: &'static mut isize| x = y;
88
| ^^^^^ cannot assign
99

1010
error[E0594]: cannot assign to `x`, as it is not declared as mutable
11-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:30:50
11+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:28:50
1212
|
1313
LL | pub fn ee(x: &'static mut isize) {
1414
| - help: consider changing this to be mutable: `mut x`
@@ -17,31 +17,31 @@ LL | let mut c2 = |y: &'static mut isize| x = y;
1717
| ^^^^^ cannot assign
1818

1919
error[E0594]: cannot assign to `x`, as it is not declared as mutable
20-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:42:14
20+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:40:14
2121
|
2222
LL | pub fn capture_assign_whole(x: (i32,)) {
2323
| - help: consider changing this to be mutable: `mut x`
2424
LL | || { x = (1,); };
2525
| ^^^^^^^^ cannot assign
2626

2727
error[E0594]: cannot assign to `x.0`, as `x` is not declared as mutable
28-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:47:14
28+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:45:14
2929
|
3030
LL | pub fn capture_assign_part(x: (i32,)) {
3131
| - help: consider changing this to be mutable: `mut x`
3232
LL | || { x.0 = 1; };
3333
| ^^^^^^^ cannot assign
3434

3535
error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
36-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:52:14
36+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:50:14
3737
|
3838
LL | pub fn capture_reborrow_whole(x: (i32,)) {
3939
| - help: consider changing this to be mutable: `mut x`
4040
LL | || { &mut x; };
4141
| ^^^^^^ cannot borrow as mutable
4242

4343
error[E0596]: cannot borrow `x.0` as mutable, as `x` is not declared as mutable
44-
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:57:14
44+
--> $DIR/issue-55492-borrowck-migrate-scans-parents.rs:55:14
4545
|
4646
LL | pub fn capture_reborrow_part(x: (i32,)) {
4747
| - help: consider changing this to be mutable: `mut x`

‎src/test/ui/borrowck/issue-55492-borrowck-migrate-scans-parents.rs

+1-3
Original file line numberDiff line numberDiff line change
@@ -3,15 +3,13 @@
33
// looks at some parent.
44

55
// revisions: migrate nll
6+
//[nll]compile-flags: -Z borrowck=mir
67

78
// Since we are testing nll (and migration) explicitly as a separate
89
// revisions, don't worry about the --compare-mode=nll on this test.
910

1011
// ignore-compare-mode-nll
1112

12-
//[nll]compile-flags: -Z borrowck=mir
13-
14-
1513
// transcribed from borrowck-closures-unique.rs
1614
mod borrowck_closures_unique {
1715
pub fn e(x: &'static mut isize) {

‎src/test/ui/borrowck/issue-58776-borrowck-scans-children.migrate.stderr

-32
This file was deleted.

‎src/test/ui/error-codes/E0161.edition.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be statically determined
2-
--> $DIR/E0161.rs:29:5
2+
--> $DIR/E0161.rs:32:5
33
|
44
LL | x.f();
55
| ^^^^^

‎src/test/ui/error-codes/E0161.migrate.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be statically determined
2-
--> $DIR/E0161.rs:29:5
2+
--> $DIR/E0161.rs:32:5
33
|
44
LL | x.f();
55
| ^^^^^

‎src/test/ui/error-codes/E0161.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be statically determined
2-
--> $DIR/E0161.rs:29:5
2+
--> $DIR/E0161.rs:32:5
33
|
44
LL | x.f();
55
| ^^^^^

‎src/test/ui/error-codes/E0161.rs

+5-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,3 @@
1-
// ignore-compare-mode-nll
2-
31
// Check that E0161 is a hard error in all possible configurations that might
42
// affect it.
53

@@ -13,6 +11,11 @@
1311
//[zflagsul] check-pass
1412
//[editionul] check-pass
1513

14+
// Since we are testing nll (and migration) explicitly as a separate
15+
// revisions, don't worry about the --compare-mode=nll on this test.
16+
17+
// ignore-compare-mode-nll
18+
1619
#![allow(incomplete_features)]
1720
#![cfg_attr(nll, feature(nll))]
1821
#![cfg_attr(nllul, feature(nll))]

‎src/test/ui/error-codes/E0161.zflags.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0161]: cannot move a value of type dyn Bar: the size of dyn Bar cannot be statically determined
2-
--> $DIR/E0161.rs:29:5
2+
--> $DIR/E0161.rs:32:5
33
|
44
LL | x.f();
55
| ^^^^^

‎src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.migrate.stderr

+10-10
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: implementation of `Parser` is not general enough
2-
--> $DIR/issue-71955.rs:52:5
2+
--> $DIR/issue-71955.rs:57:5
33
|
44
LL | foo(bar, "string", |s| s.len() == 5);
55
| ^^^ implementation of `Parser` is not general enough
@@ -8,7 +8,7 @@ LL | foo(bar, "string", |s| s.len() == 5);
88
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
99

1010
error: implementation of `Parser` is not general enough
11-
--> $DIR/issue-71955.rs:52:5
11+
--> $DIR/issue-71955.rs:57:5
1212
|
1313
LL | foo(bar, "string", |s| s.len() == 5);
1414
| ^^^ implementation of `Parser` is not general enough
@@ -17,7 +17,7 @@ LL | foo(bar, "string", |s| s.len() == 5);
1717
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
1818

1919
error: implementation of `Parser` is not general enough
20-
--> $DIR/issue-71955.rs:52:5
20+
--> $DIR/issue-71955.rs:57:5
2121
|
2222
LL | foo(bar, "string", |s| s.len() == 5);
2323
| ^^^ implementation of `Parser` is not general enough
@@ -26,7 +26,7 @@ LL | foo(bar, "string", |s| s.len() == 5);
2626
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
2727

2828
error: implementation of `Parser` is not general enough
29-
--> $DIR/issue-71955.rs:52:5
29+
--> $DIR/issue-71955.rs:57:5
3030
|
3131
LL | foo(bar, "string", |s| s.len() == 5);
3232
| ^^^ implementation of `Parser` is not general enough
@@ -35,7 +35,7 @@ LL | foo(bar, "string", |s| s.len() == 5);
3535
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
3636

3737
error: implementation of `Parser` is not general enough
38-
--> $DIR/issue-71955.rs:52:5
38+
--> $DIR/issue-71955.rs:57:5
3939
|
4040
LL | foo(bar, "string", |s| s.len() == 5);
4141
| ^^^ implementation of `Parser` is not general enough
@@ -44,7 +44,7 @@ LL | foo(bar, "string", |s| s.len() == 5);
4444
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
4545

4646
error: implementation of `Parser` is not general enough
47-
--> $DIR/issue-71955.rs:58:5
47+
--> $DIR/issue-71955.rs:63:5
4848
|
4949
LL | foo(baz, "string", |s| s.0.len() == 5);
5050
| ^^^ implementation of `Parser` is not general enough
@@ -53,7 +53,7 @@ LL | foo(baz, "string", |s| s.0.len() == 5);
5353
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
5454

5555
error: implementation of `Parser` is not general enough
56-
--> $DIR/issue-71955.rs:58:5
56+
--> $DIR/issue-71955.rs:63:5
5757
|
5858
LL | foo(baz, "string", |s| s.0.len() == 5);
5959
| ^^^ implementation of `Parser` is not general enough
@@ -62,7 +62,7 @@ LL | foo(baz, "string", |s| s.0.len() == 5);
6262
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
6363

6464
error: implementation of `Parser` is not general enough
65-
--> $DIR/issue-71955.rs:58:5
65+
--> $DIR/issue-71955.rs:63:5
6666
|
6767
LL | foo(baz, "string", |s| s.0.len() == 5);
6868
| ^^^ implementation of `Parser` is not general enough
@@ -71,7 +71,7 @@ LL | foo(baz, "string", |s| s.0.len() == 5);
7171
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
7272

7373
error: implementation of `Parser` is not general enough
74-
--> $DIR/issue-71955.rs:58:5
74+
--> $DIR/issue-71955.rs:63:5
7575
|
7676
LL | foo(baz, "string", |s| s.0.len() == 5);
7777
| ^^^ implementation of `Parser` is not general enough
@@ -80,7 +80,7 @@ LL | foo(baz, "string", |s| s.0.len() == 5);
8080
= note: ...but it actually implements `Parser<'1>`, for some specific lifetime `'1`
8181

8282
error: implementation of `Parser` is not general enough
83-
--> $DIR/issue-71955.rs:58:5
83+
--> $DIR/issue-71955.rs:63:5
8484
|
8585
LL | foo(baz, "string", |s| s.0.len() == 5);
8686
| ^^^ implementation of `Parser` is not general enough

‎src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.nll.stderr

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: fatal error triggered by #[rustc_error]
2-
--> $DIR/issue-71955.rs:42:1
2+
--> $DIR/issue-71955.rs:47:1
33
|
44
LL | fn main() {
55
| ^^^^^^^^^

‎src/test/ui/higher-rank-trait-bounds/normalize-under-binder/issue-71955.rs

+5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@
33
// [nll]compile-flags: -Zborrowck=mir
44
// check-fail
55

6+
// Since we are testing nll (and migration) explicitly as a separate
7+
// revisions, don't worry about the --compare-mode=nll on this test.
8+
9+
// ignore-compare-mode-nll
10+
611
#![feature(rustc_attrs)]
712

813
trait Parser<'s> {

‎src/test/ui/hrtb/issue-30786.migrate.stderr

+14-14
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
error[E0599]: the method `filterx` exists for struct `Map<Repeat, [closure@$DIR/issue-30786.rs:127:27: 127:36]>`, but its trait bounds were not satisfied
2-
--> $DIR/issue-30786.rs:128:22
1+
error[E0599]: the method `filterx` exists for struct `Map<Repeat, [closure@$DIR/issue-30786.rs:126:27: 126:36]>`, but its trait bounds were not satisfied
2+
--> $DIR/issue-30786.rs:127:22
33
|
44
LL | pub struct Map<S, F> {
55
| --------------------
@@ -8,19 +8,19 @@ LL | pub struct Map<S, F> {
88
| doesn't satisfy `_: StreamExt`
99
...
1010
LL | let filter = map.filterx(|x: &_| true);
11-
| ^^^^^^^ method cannot be called on `Map<Repeat, [closure@$DIR/issue-30786.rs:127:27: 127:36]>` due to unsatisfied trait bounds
11+
| ^^^^^^^ method cannot be called on `Map<Repeat, [closure@$DIR/issue-30786.rs:126:27: 126:36]>` due to unsatisfied trait bounds
1212
|
1313
note: the following trait bounds were not satisfied because of the requirements of the implementation of `StreamExt` for `_`:
14-
`&'a mut Map<Repeat, [closure@$DIR/issue-30786.rs:127:27: 127:36]>: Stream`
15-
`&'a mut &Map<Repeat, [closure@$DIR/issue-30786.rs:127:27: 127:36]>: Stream`
16-
`&'a mut &mut Map<Repeat, [closure@$DIR/issue-30786.rs:127:27: 127:36]>: Stream`
17-
--> $DIR/issue-30786.rs:106:9
14+
`&'a mut Map<Repeat, [closure@$DIR/issue-30786.rs:126:27: 126:36]>: Stream`
15+
`&'a mut &Map<Repeat, [closure@$DIR/issue-30786.rs:126:27: 126:36]>: Stream`
16+
`&'a mut &mut Map<Repeat, [closure@$DIR/issue-30786.rs:126:27: 126:36]>: Stream`
17+
--> $DIR/issue-30786.rs:105:9
1818
|
1919
LL | impl<T> StreamExt for T where for<'a> &'a mut T: Stream {}
2020
| ^^^^^^^^^ ^
2121

22-
error[E0599]: the method `countx` exists for struct `Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:140:30: 140:42]>`, but its trait bounds were not satisfied
23-
--> $DIR/issue-30786.rs:141:24
22+
error[E0599]: the method `countx` exists for struct `Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:139:30: 139:42]>`, but its trait bounds were not satisfied
23+
--> $DIR/issue-30786.rs:140:24
2424
|
2525
LL | pub struct Filter<S, F> {
2626
| -----------------------
@@ -29,13 +29,13 @@ LL | pub struct Filter<S, F> {
2929
| doesn't satisfy `_: StreamExt`
3030
...
3131
LL | let count = filter.countx();
32-
| ^^^^^^ method cannot be called on `Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:140:30: 140:42]>` due to unsatisfied trait bounds
32+
| ^^^^^^ method cannot be called on `Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:139:30: 139:42]>` due to unsatisfied trait bounds
3333
|
3434
note: the following trait bounds were not satisfied because of the requirements of the implementation of `StreamExt` for `_`:
35-
`&'a mut Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:140:30: 140:42]>: Stream`
36-
`&'a mut &Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:140:30: 140:42]>: Stream`
37-
`&'a mut &mut Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:140:30: 140:42]>: Stream`
38-
--> $DIR/issue-30786.rs:106:9
35+
`&'a mut Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:139:30: 139:42]>: Stream`
36+
`&'a mut &Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:139:30: 139:42]>: Stream`
37+
`&'a mut &mut Filter<Map<Repeat, for<'r> fn(&'r u64) -> &'r u64 {identity::<u64>}>, [closure@$DIR/issue-30786.rs:139:30: 139:42]>: Stream`
38+
--> $DIR/issue-30786.rs:105:9
3939
|
4040
LL | impl<T> StreamExt for T where for<'a> &'a mut T: Stream {}
4141
| ^^^^^^^^^ ^

0 commit comments

Comments
 (0)