---

yaml
---
r: 35256
b: refs/heads/master
c: 1c348e6
h: refs/heads/master
v: v3

Author: pcwalton

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 32763caa600857bc0116a9221e4a94431b5b6907
+refs/heads/master: 1c348e6e3832b1fd8282be696f76ac3c50115162
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: eb8fd119c65c67f3b1b8268cc7341c22d39b7b61
 refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024

trunk/src/librustc/middle/const_eval.rs

@@ -92,7 +92,8 @@ fn classify(e: @expr,
                       ast::expr_vstore_fixed(_) |
                       ast::expr_vstore_slice => classify(e, def_map, tcx),
                       ast::expr_vstore_uniq |
-                      ast::expr_vstore_box => non_const
+                      ast::expr_vstore_box |
+                      ast::expr_vstore_mut_box => non_const
                   }
               }
 

trunk/src/librustc/middle/trans/base.rs

@@ -1643,7 +1643,7 @@ fn trans_fn(ccx: @crate_ctxt,
             impl_id: Option<ast::def_id>) {
     let do_time = ccx.sess.trans_stats();
     let start = if do_time { time::get_time() }
-                else { time::Timespec::new(0, 0) };
+                else { {sec: 0i64, nsec: 0i32} };
     debug!("trans_fn(ty_self=%?)", ty_self);
     let _icx = ccx.insn_ctxt("trans_fn");
     ccx.stats.n_fns += 1;

trunk/src/librustc/middle/trans/expr.rs

@@ -392,7 +392,8 @@ fn trans_rvalue_datum_unadjusted(bcx: block, expr: @ast::expr) -> DatumBlock {
     trace_span!(bcx, expr.span, shorten(bcx.expr_to_str(expr)));
 
     match expr.node {
-        ast::expr_vstore(contents, ast::expr_vstore_box) => {
+        ast::expr_vstore(contents, ast::expr_vstore_box) |
+        ast::expr_vstore(contents, ast::expr_vstore_mut_box) => {
             return tvec::trans_uniq_or_managed_vstore(bcx, heap_shared,
                                                       expr, contents);
         }

trunk/src/librustc/middle/ty.rs

@@ -3187,6 +3187,7 @@ fn expr_kind(tcx: ctxt,
         ast::expr_addr_of(*) |
         ast::expr_binary(*) |
         ast::expr_vstore(_, ast::expr_vstore_box) |
+        ast::expr_vstore(_, ast::expr_vstore_mut_box) |
         ast::expr_vstore(_, ast::expr_vstore_uniq) => {
             RvalueDatumExpr
         }

trunk/src/librustc/middle/typeck/astconv.rs

@@ -176,13 +176,14 @@ fn ast_ty_to_ty<AC: ast_conv, RS: region_scope Copy Owned>(
         let tcx = self.tcx();
 
         match a_seq_ty.ty.node {
-            // to convert to an e{vec,str}, there can't be a
-            // mutability argument
-            _ if a_seq_ty.mutbl != ast::m_imm => (),
             ast::ty_vec(mt) => {
-                return ty::mk_evec(tcx, ast_mt_to_mt(self, rscope, mt), vst);
+                let mut mt = ast_mt_to_mt(self, rscope, mt);
+                if a_seq_ty.mutbl == ast::m_mutbl {
+                    mt = { ty: mt.ty, mutbl: ast::m_mutbl };
+                }
+                return ty::mk_evec(tcx, mt, vst);
             }
-            ast::ty_path(path, id) => {
+            ast::ty_path(path, id) if a_seq_ty.mutbl == ast::m_imm => {
                 match tcx.def_map.find(id) {
                     Some(ast::def_prim_ty(ast::ty_str)) => {
                         check_path_args(tcx, path, NO_TPS | NO_REGIONS);

trunk/src/librustc/middle/typeck/check.rs

@@ -1705,9 +1705,14 @@ fn check_expr_with_unifier(fcx: @fn_ctxt,
           }
           ast::expr_vec(args, mutbl) => {
             let tt = ast_expr_vstore_to_vstore(fcx, ev, args.len(), vst);
+            let mutability;
+            match vst {
+                ast::expr_vstore_mut_box => mutability = ast::m_mutbl,
+                _ => mutability = mutbl
+            }
             let t: ty::t = fcx.infcx().next_ty_var();
             for args.each |e| { bot |= check_expr_with(fcx, *e, t); }
-            ty::mk_evec(tcx, {ty: t, mutbl: mutbl}, tt)
+            ty::mk_evec(tcx, {ty: t, mutbl: mutability}, tt)
           }
           ast::expr_repeat(element, count_expr, mutbl) => {
             let count = ty::eval_repeat_count(tcx, count_expr, expr.span);
@@ -2721,7 +2726,7 @@ fn ast_expr_vstore_to_vstore(fcx: @fn_ctxt, e: @ast::expr, n: uint,
             ty::vstore_fixed(u)
         }
         ast::expr_vstore_uniq => ty::vstore_uniq,
-        ast::expr_vstore_box => ty::vstore_box,
+        ast::expr_vstore_box | ast::expr_vstore_mut_box => ty::vstore_box,
         ast::expr_vstore_slice => {
             let r = fcx.infcx().next_region_var(e.span, e.id);
             ty::vstore_slice(r)