Skip to content

Commit 07e7b43

Browse files
committedMay 22, 2022
Auto merge of rust-lang#97258 - jackh726:nll-revisions, r=cjgillot
Move remaining tests with NLL differences to revisions Based on rust-lang#97206 I've already filed issues for any important differences that I've spotted: rust-lang#97252 rust-lang#97253 rust-lang#97256 rust-lang#97267 There is a lot here, but each commit is self-contained as a separate directory. I can split into separate PRs as wanted or needed.
2 parents b2eed72 + 383fbee commit 07e7b43

File tree

395 files changed

+2273
-1080
lines changed

Some content is hidden

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

395 files changed

+2273
-1080
lines changed
 

‎src/test/ui/associated-type-bounds/implied-region-constraints.stderr ‎src/test/ui/associated-type-bounds/implied-region-constraints.base.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0623]: lifetime mismatch
2-
--> $DIR/implied-region-constraints.rs:17:64
2+
--> $DIR/implied-region-constraints.rs:21:64
33
|
44
LL | fn _bad_st<'a, 'b, T>(x: St<'a, 'b, T>)
55
| ------------- this type is declared with multiple lifetimes...
@@ -8,7 +8,7 @@ LL | let _failure_proves_not_implied_outlives_region_b: &'b T = &x.f0;
88
| ^^^^^ ...but data with one lifetime flows into the other here
99

1010
error[E0623]: lifetime mismatch
11-
--> $DIR/implied-region-constraints.rs:38:72
11+
--> $DIR/implied-region-constraints.rs:43:72
1212
|
1313
LL | fn _bad_en7<'a, 'b, T>(x: En7<'a, 'b, T>)
1414
| -------------- this type is declared with multiple lifetimes...

‎src/test/ui/associated-type-bounds/implied-region-constraints.nll.stderr

+2-2
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: lifetime may not live long enough
2-
--> $DIR/implied-region-constraints.rs:17:56
2+
--> $DIR/implied-region-constraints.rs:21:56
33
|
44
LL | fn _bad_st<'a, 'b, T>(x: St<'a, 'b, T>)
55
| -- -- lifetime `'b` defined here
@@ -12,7 +12,7 @@ LL | let _failure_proves_not_implied_outlives_region_b: &'b T = &x.f0;
1212
= help: consider adding the following bound: `'a: 'b`
1313

1414
error: lifetime may not live long enough
15-
--> $DIR/implied-region-constraints.rs:38:64
15+
--> $DIR/implied-region-constraints.rs:43:64
1616
|
1717
LL | fn _bad_en7<'a, 'b, T>(x: En7<'a, 'b, T>)
1818
| -- -- lifetime `'b` defined here

0 commit comments

Comments
 (0)
Please sign in to comment.