about summary refs log tree commit diff
path: root/src/test/ui/static
diff options
context:
space:
mode:
authorVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-03-11 23:18:35 +0300
committerVadim Petrochenkov <vadim.petrochenkov@gmail.com>2019-03-11 23:18:35 +0300
commitc1cfacfb13f2bdf6bd94e81164c90b2449ec60a1 (patch)
treebcea2c225e57ee199985f3128dacb9b25cf1a766 /src/test/ui/static
parentfa72a81bea27f1fda4287475e4cc2f684c971e7f (diff)
downloadrust-c1cfacfb13f2bdf6bd94e81164c90b2449ec60a1.tar.gz
rust-c1cfacfb13f2bdf6bd94e81164c90b2449ec60a1.zip
Update NLL tests
Diffstat (limited to 'src/test/ui/static')
-rw-r--r--src/test/ui/static/static-lifetime-bound.nll.stderr4
-rw-r--r--src/test/ui/static/static-reference-to-fn-2.nll.stderr2
-rw-r--r--src/test/ui/static/static-region-bound.nll.stderr2
3 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/static/static-lifetime-bound.nll.stderr b/src/test/ui/static/static-lifetime-bound.nll.stderr
index 9a8a344cbd8..90d728204e7 100644
--- a/src/test/ui/static/static-lifetime-bound.nll.stderr
+++ b/src/test/ui/static/static-lifetime-bound.nll.stderr
@@ -1,7 +1,7 @@
 warning: unnecessary lifetime parameter `'a`
   --> $DIR/static-lifetime-bound.rs:1:6
    |
-LL | fn f<'a: 'static>(_: &'a i32) {} //~WARN unnecessary lifetime parameter `'a`
+LL | fn f<'a: 'static>(_: &'a i32) {}
    |      ^^^^^^^^^^^
    |
    = help: you can use the `'static` lifetime directly, in place of `'a`
@@ -9,7 +9,7 @@ LL | fn f<'a: 'static>(_: &'a i32) {} //~WARN unnecessary lifetime parameter `'a
 error[E0597]: `x` does not live long enough
   --> $DIR/static-lifetime-bound.rs:5:7
    |
-LL |     f(&x); //~ERROR does not live long enough
+LL |     f(&x);
    |     --^^-
    |     | |
    |     | borrowed value does not live long enough
diff --git a/src/test/ui/static/static-reference-to-fn-2.nll.stderr b/src/test/ui/static/static-reference-to-fn-2.nll.stderr
index 2e00c9491d7..07c8b48eb1d 100644
--- a/src/test/ui/static/static-reference-to-fn-2.nll.stderr
+++ b/src/test/ui/static/static-reference-to-fn-2.nll.stderr
@@ -37,7 +37,7 @@ error[E0515]: cannot return value referencing temporary value
 LL | /     StateMachineIter {
 LL | |         statefn: &id(state1 as StateMachineFunc)
    | |                   ------------------------------ temporary value created here
-LL | |         //~^ ERROR borrowed value does not live long enough
+LL | |
 LL | |     }
    | |_____^ returns a value referencing data owned by the current function
 
diff --git a/src/test/ui/static/static-region-bound.nll.stderr b/src/test/ui/static/static-region-bound.nll.stderr
index 0a5686051cd..15261259ed4 100644
--- a/src/test/ui/static/static-region-bound.nll.stderr
+++ b/src/test/ui/static/static-region-bound.nll.stderr
@@ -1,7 +1,7 @@
 error[E0716]: temporary value dropped while borrowed
   --> $DIR/static-region-bound.rs:10:14
    |
-LL |     let x = &id(3); //~ ERROR borrowed value does not live long enough
+LL |     let x = &id(3);
    |              ^^^^^ creates a temporary which is freed while still in use
 LL |     f(x);
    |     ---- argument requires that borrow lasts for `'static`