---

yaml
---
r: 50530
b: refs/heads/auto
c: 44d4d6d
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -14,5 +14,5 @@ refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: 77eadc0653dac6314ee425ab2502433348c82418
+refs/heads/auto: 44d4d6de762f3f9aae1fedcf454c66b79b3ad58d
 refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167

branches/auto/src/librustc/util/ppaux.rs

@@ -248,7 +248,7 @@ pub fn trait_store_to_str(cx: ctxt, s: ty::TraitStore) -> ~str {
 pub fn vstore_ty_to_str(cx: ctxt, ty: ~str, vs: ty::vstore) -> ~str {
     match vs {
       ty::vstore_fixed(_) => {
-        fmt!("[%s * %s]", ty, vstore_to_str(cx, vs))
+        fmt!("[%s, .. %s]", ty, vstore_to_str(cx, vs))
       }
       ty::vstore_slice(_) => {
         fmt!("%s %s", vstore_to_str(cx, vs), ty)

branches/auto/src/test/compile-fail/issue-2149.rs

@@ -22,6 +22,6 @@ impl<A> vec_monad<A> for ~[A] {
 }
 fn main() {
     ["hi"].bind(|x| [x] );
-    //~^ ERROR type `[&'static str * 1]` does not implement any method in scope named `bind`
+    //~^ ERROR type `[&'static str, .. 1]` does not implement any method in scope named `bind`
     //~^^ ERROR Unconstrained region variable
 }

branches/auto/src/test/compile-fail/issue-4517.rs

@@ -2,5 +2,5 @@ fn bar(int_param: int) {}
 
 fn main() {
      let foo: [u8, ..4] = [1u8, ..4u8];
-     bar(foo); //~ ERROR mismatched types: expected `int` but found `[u8 * 4]` (expected int but found vector)
+     bar(foo); //~ ERROR mismatched types: expected `int` but found `[u8, .. 4]` (expected int but found vector)
 }