diff options
| author | Jakub Bukaj <jakub@jakub.cc> | 2014-11-09 16:14:48 +0100 |
|---|---|---|
| committer | Jakub Bukaj <jakub@jakub.cc> | 2014-11-16 14:23:15 +0100 |
| commit | 28b1b2ec393fb3c76543d7ee46b2cb2d7954b6da (patch) | |
| tree | 0742c3e6790c582c02ff169532235c3ad9f8a640 | |
| parent | eb01b17b06eb35542bb80ff7456043b0ed5572ba (diff) | |
| download | rust-28b1b2ec393fb3c76543d7ee46b2cb2d7954b6da.tar.gz rust-28b1b2ec393fb3c76543d7ee46b2cb2d7954b6da.zip | |
Update tests accordingly
| -rw-r--r-- | src/test/compile-fail/issue-16939.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/non-constant-enum-for-vec-repeat.rs | 2 | ||||
| -rw-r--r-- | src/test/compile-fail/repeat_count.rs | 5 | ||||
| -rw-r--r-- | src/test/run-pass/concat.rs | 4 |
4 files changed, 7 insertions, 6 deletions
diff --git a/src/test/compile-fail/issue-16939.rs b/src/test/compile-fail/issue-16939.rs index 8e7a2a9db3d..e7d3d15e5a9 100644 --- a/src/test/compile-fail/issue-16939.rs +++ b/src/test/compile-fail/issue-16939.rs @@ -14,7 +14,7 @@ // wrong arity. fn _foo<F: Fn()> (f: F) { - |t| f(t); //~ ERROR E0058 + |t| f(t); //~ ERROR E0057 } fn main() {} diff --git a/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs b/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs index c4d5d734a71..87fe50c8666 100644 --- a/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs +++ b/src/test/compile-fail/non-constant-enum-for-vec-repeat.rs @@ -12,5 +12,5 @@ enum State { ST_NULL, ST_WHITESPACE } fn main() { [ST_NULL, ..(ST_WHITESPACE as uint)]; - //~^ ERROR expected constant integer for repeat count, found variable + //~^ ERROR expected constant integer for repeat count, found non-constant expression } diff --git a/src/test/compile-fail/repeat_count.rs b/src/test/compile-fail/repeat_count.rs index be79a7a915b..38fbb426fb1 100644 --- a/src/test/compile-fail/repeat_count.rs +++ b/src/test/compile-fail/repeat_count.rs @@ -13,8 +13,9 @@ fn main() { let n = 1; let a = [0, ..n]; //~ ERROR expected constant integer for repeat count, found variable - let b = [0, ..()]; //~ ERROR expected positive integer for repeat count, found () - //~^ ERROR: expected `uint`, found `()` + let b = [0, ..()]; +//~^ ERROR expected constant integer for repeat count, found non-constant expression +//~^^ ERROR: expected `uint`, found `()` let c = [0, ..true]; //~ ERROR expected positive integer for repeat count, found boolean //~^ ERROR: expected `uint`, found `bool` let d = [0, ..0.5]; //~ ERROR expected positive integer for repeat count, found float diff --git a/src/test/run-pass/concat.rs b/src/test/run-pass/concat.rs index 21c247cc69e..d78f948edc5 100644 --- a/src/test/run-pass/concat.rs +++ b/src/test/run-pass/concat.rs @@ -15,12 +15,12 @@ pub fn main() { assert_eq!(concat!("qux", "quux",).to_string(), "quxquux".to_string()); assert_eq!( - concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()), + concat!(1, 2i, 3u, 4f32, 4.0, 'a', true), "12344.0atrue" ); assert!(match "12344.0atrue" { - concat!(1, 2i, 3u, 4f32, 4.0, 'a', true, ()) => true, + concat!(1, 2i, 3u, 4f32, 4.0, 'a', true) => true, _ => false }) } |