about summary refs log tree commit diff
diff options
context:
space:
mode:
authorNiko Matsakis <niko@alum.mit.edu>2018-10-16 18:11:55 -0400
committerNiko Matsakis <niko@alum.mit.edu>2018-10-16 18:11:55 -0400
commitb70b4a6814d420222f28684f9286a21ddb980bcf (patch)
treed67653f04fbfea5700640492dd913f25ff768371
parent1008539ca6a45043261854ce5ccf52df04b10c01 (diff)
downloadrust-b70b4a6814d420222f28684f9286a21ddb980bcf.tar.gz
rust-b70b4a6814d420222f28684f9286a21ddb980bcf.zip
add ~ERROR annotations
-rw-r--r--src/test/ui/nll/user-annotations/method-ufcs-inherent-1.rs1
-rw-r--r--src/test/ui/nll/user-annotations/method-ufcs-inherent-1.stderr1
-rw-r--r--src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs2
-rw-r--r--src/test/ui/nll/user-annotations/method-ufcs-inherent-2.stderr2
-rw-r--r--src/test/ui/nll/user-annotations/method-ufcs-inherent-3.rs1
-rw-r--r--src/test/ui/nll/user-annotations/method-ufcs-inherent-3.stderr1
-rw-r--r--src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs2
-rw-r--r--src/test/ui/nll/user-annotations/method-ufcs-inherent-4.stderr2
8 files changed, 12 insertions, 0 deletions
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.rs b/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.rs
index 4bca114e953..b7292c0acbe 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.rs
+++ b/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.rs
@@ -14,6 +14,7 @@ impl<'a> A<'a> {
 fn foo<'a>() {
     let v = 22;
     let x = A::<'a>::new(&v, 22);
+    //~^ ERROR
 }
 
 fn main() {}
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.stderr b/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.stderr
index 68a7684c963..aa133ce286d 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.stderr
+++ b/src/test/ui/nll/user-annotations/method-ufcs-inherent-1.stderr
@@ -3,6 +3,7 @@ error[E0597]: `v` does not live long enough
    |
 LL |     let x = A::<'a>::new(&v, 22);
    |                          ^^ borrowed value does not live long enough
+LL |     //~^ ERROR
 LL | }
    | - `v` dropped here while still borrowed
    |
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs b/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs
index f87f5cba391..a77d6af5323 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs
+++ b/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.rs
@@ -14,6 +14,8 @@ impl<'a> A<'a> {
 fn foo<'a>() {
     let v = 22;
     let x = A::<'a>::new::<&'a u32>(&v, &v);
+    //~^ ERROR
+    //~| ERROR
 }
 
 fn main() {}
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.stderr b/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.stderr
index 0bdff99da9e..f1f4787d058 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.stderr
+++ b/src/test/ui/nll/user-annotations/method-ufcs-inherent-2.stderr
@@ -3,6 +3,7 @@ error[E0597]: `v` does not live long enough
    |
 LL |     let x = A::<'a>::new::<&'a u32>(&v, &v);
    |                                     ^^ borrowed value does not live long enough
+...
 LL | }
    | - `v` dropped here while still borrowed
    |
@@ -17,6 +18,7 @@ error[E0597]: `v` does not live long enough
    |
 LL |     let x = A::<'a>::new::<&'a u32>(&v, &v);
    |                                         ^^ borrowed value does not live long enough
+...
 LL | }
    | - `v` dropped here while still borrowed
    |
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.rs b/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.rs
index d8376e4bdc4..24d83c468f4 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.rs
+++ b/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.rs
@@ -14,6 +14,7 @@ impl<'a> A<'a> {
 fn foo<'a>() {
     let v = 22;
     let x = <A<'a>>::new(&v, 22);
+    //~^ ERROR
 }
 
 fn main() {}
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.stderr b/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.stderr
index 122b26c72b2..f3766a8c8e5 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.stderr
+++ b/src/test/ui/nll/user-annotations/method-ufcs-inherent-3.stderr
@@ -3,6 +3,7 @@ error[E0597]: `v` does not live long enough
    |
 LL |     let x = <A<'a>>::new(&v, 22);
    |                          ^^ borrowed value does not live long enough
+LL |     //~^ ERROR
 LL | }
    | - `v` dropped here while still borrowed
    |
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs b/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs
index e0fb9cedd37..3f88c3df48e 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs
+++ b/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.rs
@@ -15,6 +15,8 @@ impl<'a> A<'a> {
 fn foo<'a>() {
     let v = 22;
     let x = <A<'a>>::new::<&'a u32>(&v, &v);
+    //~^ ERROR
+    //~| ERROR
 }
 
 fn main() {}
diff --git a/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.stderr b/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.stderr
index b2f4066b2e8..c9bce5077d6 100644
--- a/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.stderr
+++ b/src/test/ui/nll/user-annotations/method-ufcs-inherent-4.stderr
@@ -3,6 +3,7 @@ error[E0597]: `v` does not live long enough
    |
 LL |     let x = <A<'a>>::new::<&'a u32>(&v, &v);
    |                                     ^^ borrowed value does not live long enough
+...
 LL | }
    | - `v` dropped here while still borrowed
    |
@@ -17,6 +18,7 @@ error[E0597]: `v` does not live long enough
    |
 LL |     let x = <A<'a>>::new::<&'a u32>(&v, &v);
    |                                         ^^ borrowed value does not live long enough
+...
 LL | }
    | - `v` dropped here while still borrowed
    |