mathieu/os-rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Update affected tests.

Browse source
This commit is contained in:
David Wood 2018-07-23 16:27:24 +02:00
parent d4be95f0ff
commit 5282d7d060
No known key found for this signature in database
GPG key ID: 01760B4F9F53F154
9 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/test/ui/error-codes/E0621-does-not-trigger-for-closures.nll.stderr
View file

@ -11,7 +11,7 @@ LL | invoke(&x, |a, b| if a > b { a } else { b }); //~ ERROR E0495
| ----------^^^^^----------------- | ----------^^^^^-----------------
| | | | | | | |
| | | free region requires that `'1` must outlive `'2` | | | free region requires that `'1` must outlive `'2`
| | lifetime `'1` appears in this argument | | has type `&'1i32`
| lifetime `'2` appears in return type | lifetime `'2` appears in return type
error: aborting due to previous error error: aborting due to previous error

2
src/test/ui/issue-40510-1.nll.stderr
View file

@ -6,7 +6,7 @@ LL | || {
| |_____| | |_____|
| || | ||
LL | || &mut x LL | || &mut x
| || ^^^^^^ free region requires that `'1` must outlive `'2` | || ^^^^^^ return requires that `'1` must outlive `'2`
LL | || }; LL | || };
| || - | || -
| ||_____| | ||_____|

6
src/test/ui/issue-52213.nll.stderr
View file

@ -5,10 +5,10 @@ LL | match (&t,) { //~ ERROR cannot infer an appropriate lifetime
| ^^^^^ | ^^^^^
error: unsatisfied lifetime constraints error: unsatisfied lifetime constraints
--> $DIR/issue-52213.rs:13:11 --> $DIR/issue-52213.rs:12:11
| |
LL | ((u,),) => u, LL | match (&t,) { //~ ERROR cannot infer an appropriate lifetime
| ^ free region requires that `'a` must outlive `'b` | ^^^^^ free region requires that `'a` must outlive `'b`
error: aborting due to previous error error: aborting due to previous error

6
src/test/ui/issue-52533.nll.stderr
View file

@ -8,10 +8,10 @@ error: unsatisfied lifetime constraints
--> $DIR/issue-52533.rs:15:16 --> $DIR/issue-52533.rs:15:16
| |
LL | foo(|a, b| b) LL | foo(|a, b| b)
| - - ^ free region requires that `'1` must outlive `'2` | - - ^ closure was supposed to return data with lifetime `'1` but it is returning data with lifetime `'2`
| | | | | |
| | lifetime `'1` appears in this argument | | has type `&'1u32`
| lifetime `'2` appears in this argument | has type `&'2u32`
error: aborting due to previous error error: aborting due to previous error

4
src/test/ui/nll/closure-requirements/escape-argument-callee.stderr
View file

@ -10,8 +10,8 @@ error: unsatisfied lifetime constraints
LL | let mut closure = expect_sig(|p, y| *p = y); LL | let mut closure = expect_sig(|p, y| *p = y);
| - - ^^^^^^ free region requires that `'1` must outlive `'2` | - - ^^^^^^ free region requires that `'1` must outlive `'2`
| | | | | |
| | lifetime `'1` appears in this argument | | has type `&'1 i32`
| lifetime `'2` appears in this argument | has type `&'2 mut &'3 i32`
note: No external requirements note: No external requirements
--> $DIR/escape-argument-callee.rs:36:38 --> $DIR/escape-argument-callee.rs:36:38

6
src/test/ui/nll/closure-requirements/propagate-approximated-fail-no-postdom.stderr
View file

@ -8,12 +8,12 @@ error: unsatisfied lifetime constraints
--> $DIR/propagate-approximated-fail-no-postdom.rs:57:13 --> $DIR/propagate-approximated-fail-no-postdom.rs:57:13
| |
LL | |_outlives1, _outlives2, _outlives3, x, y| { LL | |_outlives1, _outlives2, _outlives3, x, y| {
| ---------- ---------- lifetime `'2` appears in this argument | ---------- ---------- has type `std::cell::Cell<&'3 &'4 u32>`
| | | |
| lifetime `'1` appears in this argument | has type `std::cell::Cell<&'1 &'2 u32>`
... ...
LL | demand_y(x, y, p) //~ ERROR LL | demand_y(x, y, p) //~ ERROR
| ^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2` | ^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'3`
note: No external requirements note: No external requirements
--> $DIR/propagate-approximated-fail-no-postdom.rs:53:9 --> $DIR/propagate-approximated-fail-no-postdom.rs:53:9

6
src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-no-bounds.stderr
View file

@ -8,12 +8,12 @@ error: unsatisfied lifetime constraints
--> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:47:9 --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:47:9
| |
LL | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| { LL | establish_relationships(&cell_a, &cell_b, |_outlives, x, y| {
| --------- - lifetime `'1` appears in this argument | --------- - has type `&'1 std::cell::Cell<&'2 u32>`
| | | |
| lifetime `'2` appears in this argument | has type `&'3 std::cell::Cell<&'4 &'5 u32>`
LL | // Only works if 'x: 'y: LL | // Only works if 'x: 'y:
LL | demand_y(x, y, x.get()) LL | demand_y(x, y, x.get())
| ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2` | ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'3`
note: No external requirements note: No external requirements
--> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:45:47 --> $DIR/propagate-fail-to-approximate-longer-no-bounds.rs:45:47

6
src/test/ui/nll/closure-requirements/propagate-fail-to-approximate-longer-wrong-bounds.stderr
View file

@ -8,12 +8,12 @@ error: unsatisfied lifetime constraints
--> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:51:9 --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:51:9
| |
LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| { LL | establish_relationships(&cell_a, &cell_b, |_outlives1, _outlives2, x, y| {
| ---------- ---------- lifetime `'2` appears in this argument | ---------- ---------- has type `&'4 std::cell::Cell<&'5 &'6 u32>`
| | | |
| lifetime `'1` appears in this argument | has type `&'1 std::cell::Cell<&'2 &'3 u32>`
LL | // Only works if 'x: 'y: LL | // Only works if 'x: 'y:
LL | demand_y(x, y, x.get()) LL | demand_y(x, y, x.get())
| ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'2` | ^^^^^^^^^^^^^^^^^^^^^^^ argument requires that `'1` must outlive `'4`
note: No external requirements note: No external requirements
--> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:49:47 --> $DIR/propagate-fail-to-approximate-longer-wrong-bounds.rs:49:47

6
src/test/ui/nll/closure-requirements/return-wrong-bound-region.stderr
View file

@ -8,10 +8,10 @@ error: unsatisfied lifetime constraints
--> $DIR/return-wrong-bound-region.rs:21:23 --> $DIR/return-wrong-bound-region.rs:21:23
| |
LL | expect_sig(|a, b| b); // ought to return `a` LL | expect_sig(|a, b| b); // ought to return `a`
| - - ^ free region requires that `'1` must outlive `'2` | - - ^ closure was supposed to return data with lifetime `'1` but it is returning data with lifetime `'2`
| | | | | |
| | lifetime `'1` appears in this argument | | has type `&'1 i32`
| lifetime `'2` appears in this argument | has type `&'2 i32`
note: No external requirements note: No external requirements
--> $DIR/return-wrong-bound-region.rs:21:16 --> $DIR/return-wrong-bound-region.rs:21:16