about summary refs log tree commit diff
path: root/src/test/compile-fail
diff options
context:
space:
mode:
authorMatthew Jasper <mjjasper1@gmail.com>2018-07-17 20:29:48 +0100
committerMatthew Jasper <mjjasper1@gmail.com>2018-07-20 20:01:15 +0100
commita06b2433fc2963dba4ef25deee6720c63ffcc03b (patch)
treec9136001bb8d382658622906043b0d18c6ec4f12 /src/test/compile-fail
parent13b5f69848bf4ba9213fa60e7873f6ff51fc3afc (diff)
downloadrust-a06b2433fc2963dba4ef25deee6720c63ffcc03b.tar.gz
rust-a06b2433fc2963dba4ef25deee6720c63ffcc03b.zip
Update tests for new NLL mutability errors
Diffstat (limited to 'src/test/compile-fail')
-rw-r--r--src/test/compile-fail/E0594.rs2
-rw-r--r--src/test/compile-fail/borrowck/borrowck-assign-to-constants.rs2
-rw-r--r--src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs4
-rw-r--r--src/test/compile-fail/nll/constant-thread-locals-issue-47053.rs2
4 files changed, 5 insertions, 5 deletions
diff --git a/src/test/compile-fail/E0594.rs b/src/test/compile-fail/E0594.rs
index f3fbc3b8b54..e5e96451d13 100644
--- a/src/test/compile-fail/E0594.rs
+++ b/src/test/compile-fail/E0594.rs
@@ -15,5 +15,5 @@ static NUM: i32 = 18;
 
 fn main() {
     NUM = 20; //[ast]~ ERROR E0594
-              //[mir]~^ ERROR cannot assign to immutable item `NUM`
+              //[mir]~^ ERROR cannot assign to immutable static item `NUM`
 }
diff --git a/src/test/compile-fail/borrowck/borrowck-assign-to-constants.rs b/src/test/compile-fail/borrowck/borrowck-assign-to-constants.rs
index 76a670af353..57002dd40fc 100644
--- a/src/test/compile-fail/borrowck/borrowck-assign-to-constants.rs
+++ b/src/test/compile-fail/borrowck/borrowck-assign-to-constants.rs
@@ -16,5 +16,5 @@ static foo: isize = 5;
 fn main() {
     // assigning to various global constants
     foo = 6; //[ast]~ ERROR cannot assign to immutable static item
-             //[mir]~^ ERROR cannot assign to immutable item `foo`
+             //[mir]~^ ERROR cannot assign to immutable static item `foo`
 }
diff --git a/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs b/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs
index 8eed61ec8d5..6bd52f00788 100644
--- a/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs
+++ b/src/test/compile-fail/cannot-mutate-captured-non-mut-var.rs
@@ -22,10 +22,10 @@ fn main() {
     let x = 1;
     to_fn_once(move|| { x = 2; });
     //[ast]~^ ERROR: cannot assign to immutable captured outer variable
-    //[mir]~^^ ERROR: cannot assign to immutable item `x`
+    //[mir]~^^ ERROR: cannot assign to `x`, as it is not declared as mutable
 
     let s = std::io::stdin();
     to_fn_once(move|| { s.read_to_end(&mut Vec::new()); });
     //[ast]~^ ERROR: cannot borrow immutable captured outer variable
-    //[mir]~^^ ERROR: cannot borrow immutable item `s` as mutable
+    //[mir]~^^ ERROR: cannot borrow `s` as mutable, as it is not declared as mutable
 }
diff --git a/src/test/compile-fail/nll/constant-thread-locals-issue-47053.rs b/src/test/compile-fail/nll/constant-thread-locals-issue-47053.rs
index c7dc84c1a91..7b1dd9265af 100644
--- a/src/test/compile-fail/nll/constant-thread-locals-issue-47053.rs
+++ b/src/test/compile-fail/nll/constant-thread-locals-issue-47053.rs
@@ -17,5 +17,5 @@
 static FOO: isize = 5;
 
 fn main() {
-    FOO = 6; //~ ERROR cannot assign to immutable item `FOO` [E0594]
+    FOO = 6; //~ ERROR cannot assign to immutable static item `FOO` [E0594]
 }