---

yaml
---
r: 135390
b: refs/heads/snap-stage3
c: f56c67b
h: refs/heads/master
v: v3

Author: ftxqxd

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 74090504219e4e37c1a6d9fdd8600f44b51c7b04
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: 073a1abff28c01a541d96a5c7b1bbc5c9c9d0401
+refs/heads/snap-stage3: f56c67ba86cf21c09e8ce8f7d7e6d5399bf4b262
 refs/heads/try: 14378ea357c06c23607ca61ade44f60a7a64a1c7
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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)),
           }

branches/snap-stage3/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 };

branches/snap-stage3/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]>`
 }

branches/snap-stage3/src/test/compile-fail/issue-13482.rs

@@ -12,7 +12,7 @@ fn main() {
   let x = [1,2];
   let y = match x {
     [] => None,
-//~^ ERROR expected `[<generic integer #0>, .. 2]`, found a fixed vector pattern of size 0
+//~^ ERROR expected `[<generic integer #0>, ..2]`, found a fixed vector pattern of size 0
     [a,_] => Some(a)
   };
 }

branches/snap-stage3/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]`
 }

branches/snap-stage3/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<uint>` 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
 }

branches/snap-stage3/src/test/compile-fail/issue-2149.rs

@@ -22,5 +22,5 @@ impl<A> vec_monad<A> for Vec<A> {
 }
 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`
 }

branches/snap-stage3/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)
 }