Skip to content

Commit b391b32

Browse files
committed
Use revisions for NLL in issues
1 parent b7c192e commit b391b32

Some content is hidden

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

48 files changed

+159
-78
lines changed

src/test/ui/issues/issue-10291.stderr renamed to src/test/ui/issues/issue-10291.base.stderr

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,19 +1,21 @@
11
error[E0312]: lifetime of reference outlives lifetime of borrowed content...
2-
--> $DIR/issue-10291.rs:3:9
2+
--> $DIR/issue-10291.rs:7:9
33
|
44
LL | x
55
| ^
66
|
77
note: ...the reference is valid for the anonymous lifetime #1 defined here...
8-
--> $DIR/issue-10291.rs:2:69
8+
--> $DIR/issue-10291.rs:6:69
99
|
1010
LL | drop::<Box<dyn for<'z> FnMut(&'z isize) -> &'z isize>>(Box::new(|z| {
1111
| _____________________________________________________________________^
1212
LL | | x
13+
LL | |
14+
LL | |
1315
LL | | }));
1416
| |_____^
1517
note: ...but the borrowed content is only valid for the lifetime `'x` as defined here
16-
--> $DIR/issue-10291.rs:1:9
18+
--> $DIR/issue-10291.rs:5:9
1719
|
1820
LL | fn test<'x>(x: &'x isize) {
1921
| ^^

src/test/ui/issues/issue-10291.nll.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error: lifetime may not live long enough
2-
--> $DIR/issue-10291.rs:3:9
2+
--> $DIR/issue-10291.rs:7:9
33
|
44
LL | fn test<'x>(x: &'x isize) {
55
| -- lifetime `'x` defined here

src/test/ui/issues/issue-10291.rs

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,12 @@
1+
// revisions: base nll
2+
// ignore-compare-mode-nll
3+
//[nll] compile-flags: -Z borrowck=mir
4+
15
fn test<'x>(x: &'x isize) {
26
drop::<Box<dyn for<'z> FnMut(&'z isize) -> &'z isize>>(Box::new(|z| {
3-
x //~ ERROR E0312
7+
x
8+
//[base]~^ ERROR E0312
9+
//[nll]~^^ ERROR lifetime may not live long enough
410
}));
511
}
612

src/test/ui/issues/issue-13058.stderr renamed to src/test/ui/issues/issue-13058.base.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0621]: explicit lifetime required in the type of `cont`
2-
--> $DIR/issue-13058.rs:14:26
2+
--> $DIR/issue-13058.rs:18:26
33
|
44
LL | fn check<'r, I: Iterator<Item=usize>, T: Itble<'r, usize, I>>(cont: &T) -> bool
55
| -- help: add explicit lifetime `'r` to the type of `cont`: `&'r T`

src/test/ui/issues/issue-13058.nll.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0621]: explicit lifetime required in the type of `cont`
2-
--> $DIR/issue-13058.rs:14:21
2+
--> $DIR/issue-13058.rs:18:21
33
|
44
LL | fn check<'r, I: Iterator<Item=usize>, T: Itble<'r, usize, I>>(cont: &T) -> bool
55
| -- help: add explicit lifetime `'r` to the type of `cont`: `&'r T`

src/test/ui/issues/issue-13058.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// revisions: base nll
2+
// ignore-compare-mode-nll
3+
//[nll] compile-flags: -Z borrowck=mir
4+
15
use std::ops::Range;
26

37
trait Itble<'r, T, I: Iterator<Item=T>> { fn iter(&'r self) -> I; }

src/test/ui/issues/issue-15034.stderr renamed to src/test/ui/issues/issue-15034.base.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0621]: explicit lifetime required in the type of `lexer`
2-
--> $DIR/issue-15034.rs:17:25
2+
--> $DIR/issue-15034.rs:21:25
33
|
44
LL | pub fn new(lexer: &'a mut Lexer) -> Parser<'a> {
55
| ------------- help: add explicit lifetime `'a` to the type of `lexer`: `&'a mut Lexer<'a>`

src/test/ui/issues/issue-15034.nll.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
error[E0621]: explicit lifetime required in the type of `lexer`
2-
--> $DIR/issue-15034.rs:17:9
2+
--> $DIR/issue-15034.rs:21:9
33
|
44
LL | pub fn new(lexer: &'a mut Lexer) -> Parser<'a> {
55
| ------------- help: add explicit lifetime `'a` to the type of `lexer`: `&'a mut Lexer<'a>`

src/test/ui/issues/issue-15034.rs

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
// revisions: base nll
2+
// ignore-compare-mode-nll
3+
//[nll] compile-flags: -Z borrowck=mir
4+
15
pub struct Lexer<'a> {
26
input: &'a str,
37
}

src/test/ui/issues/issue-16683.stderr renamed to src/test/ui/issues/issue-16683.base.stderr

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,26 +1,26 @@
11
error[E0495]: cannot infer an appropriate lifetime for autoref due to conflicting requirements
2-
--> $DIR/issue-16683.rs:4:14
2+
--> $DIR/issue-16683.rs:8:14
33
|
44
LL | self.a();
55
| ^
66
|
77
note: first, the lifetime cannot outlive the anonymous lifetime defined here...
8-
--> $DIR/issue-16683.rs:3:10
8+
--> $DIR/issue-16683.rs:7:10
99
|
1010
LL | fn b(&self) {
1111
| ^^^^^
1212
note: ...so that reference does not outlive borrowed content
13-
--> $DIR/issue-16683.rs:4:9
13+
--> $DIR/issue-16683.rs:8:9
1414
|
1515
LL | self.a();
1616
| ^^^^
1717
note: but, the lifetime must be valid for the lifetime `'a` as defined here...
18-
--> $DIR/issue-16683.rs:1:9
18+
--> $DIR/issue-16683.rs:5:9
1919
|
2020
LL | trait T<'a> {
2121
| ^^
2222
note: ...so that the types are compatible
23-
--> $DIR/issue-16683.rs:4:14
23+
--> $DIR/issue-16683.rs:8:14
2424
|
2525
LL | self.a();
2626
| ^

0 commit comments

Comments
 (0)