diff options
| author | Felix S. Klock II <pnkfelix@pnkfx.org> | 2018-06-15 05:49:53 +0200 |
|---|---|---|
| committer | Felix S. Klock II <pnkfelix@pnkfx.org> | 2018-06-19 19:41:54 +0200 |
| commit | a32fca71ed038542c1c92cbcd8b80b71ecc7690c (patch) | |
| tree | d671591289e3061a5473d46f970676f5bad2c67c | |
| parent | 35971ccc4127ca74b684dd23b8cd54aa89ef8d96 (diff) | |
| download | rust-a32fca71ed038542c1c92cbcd8b80b71ecc7690c.tar.gz rust-a32fca71ed038542c1c92cbcd8b80b71ecc7690c.zip | |
Update the existing compile-fail tests to reflect diagnostic changes in NLL.
6 files changed, 8 insertions, 1 deletions
diff --git a/src/test/compile-fail/assign-imm-local-twice.rs b/src/test/compile-fail/assign-imm-local-twice.rs index d5e412c3745..ee9dafdd49e 100644 --- a/src/test/compile-fail/assign-imm-local-twice.rs +++ b/src/test/compile-fail/assign-imm-local-twice.rs @@ -13,6 +13,7 @@ fn test() { let v: isize; + //[mir]~^ NOTE consider changing this to `mut v` v = 1; //[ast]~ NOTE first assignment //[mir]~^ NOTE first assignment println!("v={}", v); diff --git a/src/test/compile-fail/issue-45199.rs b/src/test/compile-fail/issue-45199.rs index ecddb4c101f..61e19ffc0d2 100644 --- a/src/test/compile-fail/issue-45199.rs +++ b/src/test/compile-fail/issue-45199.rs @@ -13,6 +13,7 @@ fn test_drop_replace() { let b: Box<isize>; + //[mir]~^ NOTE consider changing this to `mut b` b = Box::new(1); //[ast]~ NOTE first assignment //[mir]~^ NOTE first assignment b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable variable @@ -24,6 +25,7 @@ fn test_drop_replace() { fn test_call() { let b = Box::new(1); //[ast]~ NOTE first assignment //[mir]~^ NOTE first assignment + //[mir]~| NOTE consider changing this to `mut b` b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable variable //[mir]~^ ERROR cannot assign twice to immutable variable `b` //[ast]~| NOTE cannot assign twice to immutable @@ -31,7 +33,7 @@ fn test_call() { } fn test_args(b: Box<i32>) { //[ast]~ NOTE first assignment - //[mir]~^ NOTE argument not declared as `mut` + //[mir]~^ NOTE consider changing this to `mut b` b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable variable //[mir]~^ ERROR cannot assign to immutable argument `b` //[ast]~| NOTE cannot assign twice to immutable diff --git a/src/test/compile-fail/liveness-assign-imm-local-in-loop.rs b/src/test/compile-fail/liveness-assign-imm-local-in-loop.rs index f28906ddb95..7bc3680ca77 100644 --- a/src/test/compile-fail/liveness-assign-imm-local-in-loop.rs +++ b/src/test/compile-fail/liveness-assign-imm-local-in-loop.rs @@ -13,6 +13,7 @@ fn test() { let v: isize; + //[mir]~^ NOTE consider changing this to `mut v` loop { v = 1; //[ast]~ ERROR cannot assign twice to immutable variable //[mir]~^ ERROR cannot assign twice to immutable variable `v` diff --git a/src/test/compile-fail/liveness-assign-imm-local-in-op-eq.rs b/src/test/compile-fail/liveness-assign-imm-local-in-op-eq.rs index 594cc076121..7812cdd8684 100644 --- a/src/test/compile-fail/liveness-assign-imm-local-in-op-eq.rs +++ b/src/test/compile-fail/liveness-assign-imm-local-in-op-eq.rs @@ -13,6 +13,7 @@ fn test() { let v: isize; + //[mir]~^ NOTE consider changing this to `mut v` v = 2; //[ast]~ NOTE first assignment //[mir]~^ NOTE first assignment v += 1; //[ast]~ ERROR cannot assign twice to immutable variable diff --git a/src/test/compile-fail/liveness-assign-imm-local-with-drop.rs b/src/test/compile-fail/liveness-assign-imm-local-with-drop.rs index b4fb33ca15e..bb61a9037d9 100644 --- a/src/test/compile-fail/liveness-assign-imm-local-with-drop.rs +++ b/src/test/compile-fail/liveness-assign-imm-local-with-drop.rs @@ -14,6 +14,7 @@ fn test() { let b = Box::new(1); //[ast]~ NOTE first assignment //[mir]~^ NOTE first assignment + //[mir]~| NOTE consider changing this to `mut b` drop(b); b = Box::new(2); //[ast]~ ERROR cannot assign twice to immutable variable //[mir]~^ ERROR cannot assign twice to immutable variable `b` diff --git a/src/test/compile-fail/liveness-assign-imm-local-with-init.rs b/src/test/compile-fail/liveness-assign-imm-local-with-init.rs index 7204b5d5f2e..672e9fab837 100644 --- a/src/test/compile-fail/liveness-assign-imm-local-with-init.rs +++ b/src/test/compile-fail/liveness-assign-imm-local-with-init.rs @@ -14,6 +14,7 @@ fn test() { let v: isize = 1; //[ast]~ NOTE first assignment //[mir]~^ NOTE first assignment + //[mir]~| NOTE consider changing this to `mut v` v.clone(); v = 2; //[ast]~ ERROR cannot assign twice to immutable variable //[mir]~^ ERROR cannot assign twice to immutable variable `v` |