Skip to content

Commit 817d074

Browse files
committed
Auto merge of #59250 - bovinebuddha:filter_ui_revision_tests, r=petrochenkov
Filter ui revision tests Updates UI test output filtering to also filter away test annotations for revisions: Previously filtered: //~ ERROR [XXXX] Now also filters: //[revision]~ ERROR [XXXX] I reckon, if we have the one, we should have the other for consistency, its lack was probably an oversight (the existence of revision testing is not really well documented...)
2 parents c82834e + 704649d commit 817d074

File tree

175 files changed

+561
-721
lines changed

Some content is hidden

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

175 files changed

+561
-721
lines changed

src/test/ui/E0501.ast.nll.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | let bar = || {
66
LL | inside_closure(a)
77
| - first borrow occurs due to use of `a` in closure
88
LL | };
9-
LL | outside_closure_1(a); //[ast]~ ERROR cannot borrow `*a` as mutable because previous closure requires unique access
9+
LL | outside_closure_1(a);
1010
| ^ second borrow occurs here
1111
...
1212
LL | drop(bar);
@@ -20,7 +20,7 @@ LL | let bar = || {
2020
LL | inside_closure(a)
2121
| - first borrow occurs due to use of `a` in closure
2222
...
23-
LL | outside_closure_2(a); //[ast]~ ERROR cannot borrow `*a` as immutable because previous closure requires unique access
23+
LL | outside_closure_2(a);
2424
| ^ second borrow occurs here
2525
...
2626
LL | drop(bar);

src/test/ui/E0501.ast.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | let bar = || {
66
LL | inside_closure(a)
77
| - previous borrow occurs due to use of `a` in closure
88
LL | };
9-
LL | outside_closure_1(a); //[ast]~ ERROR cannot borrow `*a` as mutable because previous closure requires unique access
9+
LL | outside_closure_1(a);
1010
| ^ borrow occurs here
1111
...
1212
LL | }
@@ -20,7 +20,7 @@ LL | let bar = || {
2020
LL | inside_closure(a)
2121
| - previous borrow occurs due to use of `a` in closure
2222
...
23-
LL | outside_closure_2(a); //[ast]~ ERROR cannot borrow `*a` as immutable because previous closure requires unique access
23+
LL | outside_closure_2(a);
2424
| ^ borrow occurs here
2525
...
2626
LL | }

src/test/ui/E0501.mir.stderr

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ LL | let bar = || {
66
LL | inside_closure(a)
77
| - first borrow occurs due to use of `a` in closure
88
LL | };
9-
LL | outside_closure_1(a); //[ast]~ ERROR cannot borrow `*a` as mutable because previous closure requires unique access
9+
LL | outside_closure_1(a);
1010
| ^ second borrow occurs here
1111
...
1212
LL | drop(bar);
@@ -20,7 +20,7 @@ LL | let bar = || {
2020
LL | inside_closure(a)
2121
| - first borrow occurs due to use of `a` in closure
2222
...
23-
LL | outside_closure_2(a); //[ast]~ ERROR cannot borrow `*a` as immutable because previous closure requires unique access
23+
LL | outside_closure_2(a);
2424
| ^ second borrow occurs here
2525
...
2626
LL | drop(bar);

src/test/ui/E0506.ast.nll.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ error[E0506]: cannot assign to `fancy_num` because it is borrowed
33
|
44
LL | let fancy_ref = &fancy_num;
55
| ---------- borrow of `fancy_num` occurs here
6-
LL | fancy_num = FancyNum { num: 6 }; //[ast]~ ERROR E0506
6+
LL | fancy_num = FancyNum { num: 6 };
77
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `fancy_num` occurs here
88
...
99
LL | println!("Num: {}, Ref: {}", fancy_num.num, fancy_ref.num);

src/test/ui/E0506.ast.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ error[E0506]: cannot assign to `fancy_num` because it is borrowed
33
|
44
LL | let fancy_ref = &fancy_num;
55
| --------- borrow of `fancy_num` occurs here
6-
LL | fancy_num = FancyNum { num: 6 }; //[ast]~ ERROR E0506
6+
LL | fancy_num = FancyNum { num: 6 };
77
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `fancy_num` occurs here
88

99
error: aborting due to previous error

src/test/ui/E0506.mir.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ error[E0506]: cannot assign to `fancy_num` because it is borrowed
33
|
44
LL | let fancy_ref = &fancy_num;
55
| ---------- borrow of `fancy_num` occurs here
6-
LL | fancy_num = FancyNum { num: 6 }; //[ast]~ ERROR E0506
6+
LL | fancy_num = FancyNum { num: 6 };
77
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ assignment to borrowed `fancy_num` occurs here
88
...
99
LL | println!("Num: {}, Ref: {}", fancy_num.num, fancy_ref.num);

src/test/ui/E0508-fail.ast.nll.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array
22
--> $DIR/E0508-fail.rs:8:18
33
|
4-
LL | let _value = array[0]; //[ast]~ ERROR [E0508]
4+
LL | let _value = array[0];
55
| ^^^^^^^^
66
| |
77
| cannot move out of here

src/test/ui/E0508-fail.ast.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array
22
--> $DIR/E0508-fail.rs:8:18
33
|
4-
LL | let _value = array[0]; //[ast]~ ERROR [E0508]
4+
LL | let _value = array[0];
55
| ^^^^^^^^
66
| |
77
| cannot move out of here

src/test/ui/E0508-fail.mir.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
error[E0508]: cannot move out of type `[NonCopy; 1]`, a non-copy array
22
--> $DIR/E0508-fail.rs:8:18
33
|
4-
LL | let _value = array[0]; //[ast]~ ERROR [E0508]
4+
LL | let _value = array[0];
55
| ^^^^^^^^
66
| |
77
| cannot move out of here

src/test/ui/E0508.ast.stderr

Lines changed: 0 additions & 12 deletions
This file was deleted.

0 commit comments

Comments
 (0)