---

brson · brson · commit 47f5cad68e1e · 2011-08-12T16:13:13.000-07:00
yaml --- r: 4643 b: refs/heads/master c: 594c7fb h: refs/heads/master i: 4641: 6869acf 4639: 42de812 v: v3
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 12b03dd3d444f8b78bef2d69c1aab88e5b1cbf4b
+refs/heads/master: 594c7fb0c6eb997afa7da32a2a6b4f0f78522c3f
diff --git a/trunk/src/comp/middle/ty.rs b/trunk/src/comp/middle/ty.rs
@@ -3064,11 +3064,14 @@ fn is_binopable(cx: &ctxt, ty: t, op: ast::binop) -> bool {
          /*vec*/
          /*bot*/
         tbl =
-        [[f, f, f, f, t, t, f, f], [f, f, f, f, t, t, t, t],
-         [t, t, t, t, t, t, t, f], [t, t, t, f, t, t, f, f],
-         [t, f, f, f, t, t, f, f], [t, f, f, f, t, t, f, f],
-         [f, f, f, f, t, t, f, f],
-         [t, t, t, t, t, t, t, t]]; /*struct*/
+        ~[~[f, f, f, f, t, t, f, f],
+          ~[f, f, f, f, t, t, t, t],
+          ~[t, t, t, t, t, t, t, f],
+          ~[t, t, t, f, t, t, f, f],
+          ~[t, f, f, f, t, t, f, f],
+          ~[t, f, f, f, t, t, f, f],
+          ~[f, f, f, f, t, t, f, f],
+          ~[t, t, t, t, t, t, t, t]]; /*struct*/
 
     ret tbl.(tycat(cx, ty)).(opcat(op));
 }
diff --git a/trunk/src/comp/syntax/ext/simplext.rs b/trunk/src/comp/syntax/ext/simplext.rs
@@ -583,15 +583,15 @@ fn p_t_s_r_ellipses(cx: &ext_ctxt, repeat_me: @expr, offset: uint,
               match_expr(e) {
                 alt e.node {
                   expr_vec(arg_elts, _, _) {
-                    let elts = [];
+                    let elts = ~[];
                     let idx = offset;
                     while idx < ivec::len(arg_elts) {
-                        elts += [leaf(match_expr(arg_elts.(idx)))];
+                        elts += ~[leaf(match_expr(arg_elts.(idx)))];
                         idx += 1u;
                     }
                     // using repeat_me.span is a little wacky, but the
                     // error we want to report is one in the macro def
-                    some(seq(@ivec::from_vec(elts), repeat_me.span))
+                    some(seq(@elts, repeat_me.span))
                   }
                   _ { none }
                 }

Original file line number	Diff line number	Diff line change
`@@ -1,2 +1,2 @@`
`1`	`1`	`---`
`2`		`-refs/heads/master: 12b03dd3d444f8b78bef2d69c1aab88e5b1cbf4b`
	`2`	`+refs/heads/master: 594c7fb0c6eb997afa7da32a2a6b4f0f78522c3f`
Original file line number	Diff line number	Diff line change
`@@ -583,15 +583,15 @@ fn p_t_s_r_ellipses(cx: &ext_ctxt, repeat_me: @expr, offset: uint,`
`583`	`583`	`match_expr(e) {`
`584`	`584`	`alt e.node {`
`585`	`585`	`expr_vec(arg_elts, _, _) {`
`586`		`- let elts = [];`
	`586`	`+ let elts = ~[];`
`587`	`587`	`let idx = offset;`
`588`	`588`	`while idx < ivec::len(arg_elts) {`
`589`		`- elts += [leaf(match_expr(arg_elts.(idx)))];`
	`589`	`+ elts += ~[leaf(match_expr(arg_elts.(idx)))];`
`590`	`590`	`idx += 1u;`
`591`	`591`	`}`
`592`	`592`	`// using repeat_me.span is a little wacky, but the`
`593`	`593`	`// error we want to report is one in the macro def`
`594`		`- some(seq(@ivec::from_vec(elts), repeat_me.span))`
	`594`	`+ some(seq(@elts, repeat_me.span))`
`595`	`595`	`}`
`596`	`596`	`_ { none }`
`597`	`597`	`}`