about summary refs log tree commit diff
path: root/src/test/ui/codemap_tests
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/codemap_tests
parentfa72a81bea27f1fda4287475e4cc2f684c971e7f (diff)
downloadrust-c1cfacfb13f2bdf6bd94e81164c90b2449ec60a1.tar.gz
rust-c1cfacfb13f2bdf6bd94e81164c90b2449ec60a1.zip
Update NLL tests
Diffstat (limited to 'src/test/ui/codemap_tests')
-rw-r--r--src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr2
-rw-r--r--src/test/ui/codemap_tests/issue-11715.nll.stderr2
-rw-r--r--src/test/ui/codemap_tests/one_line.nll.stderr2
-rw-r--r--src/test/ui/codemap_tests/tab_3.nll.stderr2
4 files changed, 4 insertions, 4 deletions
diff --git a/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr b/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr
index 7fdeb03acbd..a60f1c77a58 100644
--- a/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr
+++ b/src/test/ui/codemap_tests/huge_multispan_highlight.nll.stderr
@@ -4,7 +4,7 @@ error[E0596]: cannot borrow `x` as mutable, as it is not declared as mutable
 LL |     let x = "foo";
    |         - help: consider changing this to be mutable: `mut x`
 ...
-LL |     let y = &mut x; //~ ERROR cannot borrow
+LL |     let y = &mut x;
    |             ^^^^^^ cannot borrow as mutable
 
 error: aborting due to previous error
diff --git a/src/test/ui/codemap_tests/issue-11715.nll.stderr b/src/test/ui/codemap_tests/issue-11715.nll.stderr
index 9f30f385425..d0c29c768eb 100644
--- a/src/test/ui/codemap_tests/issue-11715.nll.stderr
+++ b/src/test/ui/codemap_tests/issue-11715.nll.stderr
@@ -3,7 +3,7 @@ error[E0499]: cannot borrow `x` as mutable more than once at a time
    |
 LL |     let y = &mut x;
    |             ------ first mutable borrow occurs here
-LL |     let z = &mut x; //~ ERROR cannot borrow
+LL |     let z = &mut x;
    |             ^^^^^^ second mutable borrow occurs here
 LL |     z.use_mut();
 LL |     y.use_mut();
diff --git a/src/test/ui/codemap_tests/one_line.nll.stderr b/src/test/ui/codemap_tests/one_line.nll.stderr
index 0eb257c5976..eddbd29c0ef 100644
--- a/src/test/ui/codemap_tests/one_line.nll.stderr
+++ b/src/test/ui/codemap_tests/one_line.nll.stderr
@@ -1,7 +1,7 @@
 error[E0499]: cannot borrow `v` as mutable more than once at a time
   --> $DIR/one_line.rs:3:12
    |
-LL |     v.push(v.pop().unwrap()); //~ ERROR cannot borrow
+LL |     v.push(v.pop().unwrap());
    |     - ---- ^ second mutable borrow occurs here
    |     | |
    |     | first borrow later used by call
diff --git a/src/test/ui/codemap_tests/tab_3.nll.stderr b/src/test/ui/codemap_tests/tab_3.nll.stderr
index 3b8507a067d..97816a76004 100644
--- a/src/test/ui/codemap_tests/tab_3.nll.stderr
+++ b/src/test/ui/codemap_tests/tab_3.nll.stderr
@@ -6,7 +6,7 @@ LL |     let some_vec = vec!["hi"];
 LL |     some_vec.into_iter();
    |     -------- value moved here
 LL |     {
-LL |         println!("{:?}", some_vec); //~ ERROR use of moved
+LL |         println!("{:?}", some_vec);
    |                          ^^^^^^^^ value borrowed here after move
 
 error: aborting due to previous error