From f56c67ba86cf21c09e8ce8f7d7e6d5399bf4b262 Mon Sep 17 00:00:00 2001 From: P1start Date: Sat, 13 Sep 2014 14:12:22 +1200 Subject: [PATCH] Change rustc pretty-printing to print [T, ..n] instead of [T, .. n] --- src/librustc/util/ppaux.rs | 2 +- src/test/compile-fail/dst-bad-coerce1.rs | 2 +- src/test/compile-fail/dst-bad-coerce4.rs | 2 +- src/test/compile-fail/issue-13482.rs | 2 +- src/test/compile-fail/issue-14845.rs | 4 ++-- src/test/compile-fail/issue-17441.rs | 4 ++-- src/test/compile-fail/issue-2149.rs | 2 +- src/test/compile-fail/issue-4517.rs | 2 +- 8 files changed, 10 insertions(+), 10 deletions(-) diff --git a/src/librustc/util/ppaux.rs b/src/librustc/util/ppaux.rs index 7edd809e4442..7ed9d556a0ba 100644 --- a/src/librustc/util/ppaux.rs +++ b/src/librustc/util/ppaux.rs @@ -427,7 +427,7 @@ pub fn ty_to_string(cx: &ctxt, typ: t) -> String { ty_vec(t, sz) => { match sz { Some(n) => { - format!("[{}, .. {}]", ty_to_string(cx, t), n) + format!("[{}, ..{}]", ty_to_string(cx, t), n) } None => format!("[{}]", ty_to_string(cx, t)), } diff --git a/src/test/compile-fail/dst-bad-coerce1.rs b/src/test/compile-fail/dst-bad-coerce1.rs index 4247f91a4fc5..59499ac070d6 100644 --- a/src/test/compile-fail/dst-bad-coerce1.rs +++ b/src/test/compile-fail/dst-bad-coerce1.rs @@ -22,7 +22,7 @@ pub fn main() { let f1 = Fat { ptr: [1, 2, 3] }; let f2: &Fat<[int, ..3]> = &f1; let f3: &Fat<[uint]> = f2; - //~^ ERROR mismatched types: expected `&Fat<[uint]>`, found `&Fat<[int, .. 3]>` + //~^ ERROR mismatched types: expected `&Fat<[uint]>`, found `&Fat<[int, ..3]>` // With a trait. let f1 = Fat { ptr: Foo }; diff --git a/src/test/compile-fail/dst-bad-coerce4.rs b/src/test/compile-fail/dst-bad-coerce4.rs index 9a192334997d..9010185f76b6 100644 --- a/src/test/compile-fail/dst-bad-coerce4.rs +++ b/src/test/compile-fail/dst-bad-coerce4.rs @@ -18,5 +18,5 @@ pub fn main() { // With a vec of ints. let f1: &Fat<[int]> = &Fat { ptr: [1, 2, 3] }; let f2: &Fat<[int, ..3]> = f1; - //~^ ERROR mismatched types: expected `&Fat<[int, .. 3]>`, found `&Fat<[int]>` + //~^ ERROR mismatched types: expected `&Fat<[int, ..3]>`, found `&Fat<[int]>` } diff --git a/src/test/compile-fail/issue-13482.rs b/src/test/compile-fail/issue-13482.rs index 2d7458944269..e5d87395286e 100644 --- a/src/test/compile-fail/issue-13482.rs +++ b/src/test/compile-fail/issue-13482.rs @@ -12,7 +12,7 @@ fn main() { let x = [1,2]; let y = match x { [] => None, -//~^ ERROR expected `[, .. 2]`, found a fixed vector pattern of size 0 +//~^ ERROR expected `[, ..2]`, found a fixed vector pattern of size 0 [a,_] => Some(a) }; } diff --git a/src/test/compile-fail/issue-14845.rs b/src/test/compile-fail/issue-14845.rs index fc5a591ebd60..bc606d8139f0 100644 --- a/src/test/compile-fail/issue-14845.rs +++ b/src/test/compile-fail/issue-14845.rs @@ -16,9 +16,9 @@ struct X { fn main() { let x = X { a: [0] }; let _f = &x.a as *mut u8; - //~^ ERROR mismatched types: expected `*mut u8`, found `&[u8, .. 1]` + //~^ ERROR mismatched types: expected `*mut u8`, found `&[u8, ..1]` let local = [0u8]; let _v = &local as *mut u8; - //~^ ERROR mismatched types: expected `*mut u8`, found `&[u8, .. 1]` + //~^ ERROR mismatched types: expected `*mut u8`, found `&[u8, ..1]` } diff --git a/src/test/compile-fail/issue-17441.rs b/src/test/compile-fail/issue-17441.rs index da548ca5ffe3..da5590971bc3 100644 --- a/src/test/compile-fail/issue-17441.rs +++ b/src/test/compile-fail/issue-17441.rs @@ -10,7 +10,7 @@ fn main() { let _foo = &[1u, 2] as [uint]; - //~^ ERROR cast to unsized type: `&[uint, .. 2]` as `[uint]` + //~^ ERROR cast to unsized type: `&[uint, ..2]` as `[uint]` //~^^ NOTE consider using an implicit coercion to `&[uint]` instead let _bar = box 1u as std::fmt::Show; //~^ ERROR cast to unsized type: `Box` as `core::fmt::Show` @@ -19,6 +19,6 @@ fn main() { //~^ ERROR cast to unsized type: `uint` as `core::fmt::Show` //~^^ NOTE consider using a box or reference as appropriate let _quux = [1u, 2] as [uint]; - //~^ ERROR cast to unsized type: `[uint, .. 2]` as `[uint]` + //~^ ERROR cast to unsized type: `[uint, ..2]` as `[uint]` //~^^ NOTE consider using a box or reference as appropriate } diff --git a/src/test/compile-fail/issue-2149.rs b/src/test/compile-fail/issue-2149.rs index 5d07472afbb2..81f57dd96402 100644 --- a/src/test/compile-fail/issue-2149.rs +++ b/src/test/compile-fail/issue-2149.rs @@ -22,5 +22,5 @@ impl vec_monad for Vec { } fn main() { ["hi"].bind(|x| [x] ); - //~^ ERROR type `[&str, .. 1]` does not implement any method in scope named `bind` + //~^ ERROR type `[&str, ..1]` does not implement any method in scope named `bind` } diff --git a/src/test/compile-fail/issue-4517.rs b/src/test/compile-fail/issue-4517.rs index d80f2d1263d9..f61ed35fca35 100644 --- a/src/test/compile-fail/issue-4517.rs +++ b/src/test/compile-fail/issue-4517.rs @@ -13,6 +13,6 @@ fn bar(int_param: int) {} fn main() { let foo: [u8, ..4] = [1u8, ..4u]; bar(foo); - //~^ ERROR mismatched types: expected `int`, found `[u8, .. 4]` + //~^ ERROR mismatched types: expected `int`, found `[u8, ..4]` // (expected int, found vector) }