Adjust & --bless tests due to no longer downgrading NLL errors on 2015.

Centril · Sep 25, 2019 · b9eaad2 · b9eaad2
1 parent 0c7c98f
commit b9eaad2
Show file tree

Hide file tree

Showing 39 changed files with 104 additions and 1,174 deletions.
diff --git a/src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr b/src/test/ui/borrowck/borrowck-anon-fields-variant.nll.stderr
diff --git a/src/test/ui/borrowck/borrowck-anon-fields-variant.rs b/src/test/ui/borrowck/borrowck-anon-fields-variant.rs
@@ -15,9 +15,7 @@ fn distinct_variant() {
     // reference.
     let b = match y {
       Foo::Y(_, ref mut b) => b,
-      //~^ WARNING cannot use `y`
-      //~| WARNING this error has been downgraded to a warning
-      //~| WARNING this warning will become a hard error in the future
+      //~^ ERROR cannot use `y`
       Foo::X => panic!()
     };
 

diff --git a/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr b/src/test/ui/borrowck/borrowck-anon-fields-variant.stderr
@@ -1,4 +1,4 @@
-warning[E0503]: cannot use `y` because it was mutably borrowed
+error[E0503]: cannot use `y` because it was mutably borrowed
   --> $DIR/borrowck-anon-fields-variant.rs:17:7
    |
 LL |       Foo::Y(ref mut a, _) => a,
@@ -9,13 +9,9 @@ LL |       Foo::Y(_, ref mut b) => b,
 ...
 LL |     *a += 1;
    |     ------- borrow later used here
-   |
-   = warning: this error has been downgraded to a warning for backwards compatibility with previous releases
-   = warning: this represents potential undefined behavior in your code and this warning will become a hard error in the future
-   = note: for more information, try `rustc --explain E0729`
 
 error[E0503]: cannot use `y` because it was mutably borrowed
-  --> $DIR/borrowck-anon-fields-variant.rs:37:7
+  --> $DIR/borrowck-anon-fields-variant.rs:35:7
    |
 LL |       Foo::Y(ref mut a, _) => a,
    |              --------- borrow of `y.0` occurs here
@@ -27,7 +23,7 @@ LL |     *a += 1;
    |     ------- borrow later used here
 
 error[E0499]: cannot borrow `y.0` as mutable more than once at a time
-  --> $DIR/borrowck-anon-fields-variant.rs:37:14
+  --> $DIR/borrowck-anon-fields-variant.rs:35:14
    |
 LL |       Foo::Y(ref mut a, _) => a,
    |              --------- first mutable borrow occurs here
@@ -38,7 +34,7 @@ LL |       Foo::Y(ref mut b, _) => b,
 LL |     *a += 1;
    |     ------- first borrow later used here
 
-error: aborting due to 2 previous errors
+error: aborting due to 3 previous errors
 
 Some errors have detailed explanations: E0499, E0503.
 For more information about an error, try `rustc --explain E0499`.