---

yaml
---
r: 16317
b: refs/heads/try
c: 08520a1
h: refs/heads/master
i:
  16315: c394fb1
v: v3

Author: nikomatsakis

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: d9db4f02a4092009a29fa4b2f0be0438856aeb36
+refs/heads/try: 08520a16978264eb599d4df843794126656f78d3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/rustc/middle/borrowck.rs

@@ -164,6 +164,7 @@ import util::common::indenter;
 import ast_util::op_expr_callee_id;
 import ty::to_str;
 import driver::session::session;
+import dvec::{dvec, extensions};
 
 export check_crate, root_map, mutbl_map;
 
@@ -298,7 +299,7 @@ type loan = {lp: @loan_path, cmt: cmt, mutbl: ast::mutability};
 
 // maps computed by `gather_loans` that are then used by `check_loans`
 type req_maps = {
-    req_loan_map: hashmap<ast::node_id, @mut [@const [loan]]>,
+    req_loan_map: hashmap<ast::node_id, @dvec<@dvec<loan>>>,
     pure_map: hashmap<ast::node_id, bckerr>
 };
 

branches/try/src/rustc/middle/borrowck/check_loans.rs

@@ -7,6 +7,7 @@
 // 3. assignments do not affect things loaned out as immutable
 // 4. moves to dnot affect things loaned out in any way
 
+import dvec::{dvec, extensions};
 import categorization::public_methods;
 
 export check_loans;
@@ -22,7 +23,7 @@ enum check_loan_ctxt = @{
     // we are in a ctor, we track the self id
     mut in_ctor: bool,
     mut declared_purity: ast::purity,
-    mut fn_args: [ast::node_id]
+    mut fn_args: @[ast::node_id]
 };
 
 // if we are enforcing purity, why are we doing so?
@@ -44,7 +45,7 @@ fn check_loans(bccx: borrowck_ctxt,
                                  reported: int_hash(),
                                  mut in_ctor: false,
                                  mut declared_purity: ast::impure_fn,
-                                 mut fn_args: []});
+                                 mut fn_args: @[]});
     let vt = visit::mk_vt(@{visit_expr: check_loans_in_expr,
                             visit_block: check_loans_in_block,
                             visit_fn: check_loans_in_fn
@@ -179,7 +180,7 @@ impl methods for check_loan_ctxt {
                 let did = ast_util::def_id_of_def(def);
                 let is_fn_arg =
                     did.crate == ast::local_crate &&
-                    self.fn_args.contains(did.node);
+                    (*self.fn_args).contains(did.node);
                 if is_fn_arg { ret; } // case (a) above
               }
               ast::expr_fn_block(*) | ast::expr_fn(*) |
@@ -225,7 +226,8 @@ impl methods for check_loan_ctxt {
           ast::expr_path(_) {
             let def = self.tcx().def_map.get(expr.id);
             let did = ast_util::def_id_of_def(def);
-            did.crate == ast::local_crate && self.fn_args.contains(did.node)
+            did.crate == ast::local_crate &&
+                (*self.fn_args).contains(did.node)
           }
           ast::expr_fn_block(*) | ast::expr_fn(*) {
             self.is_stack_closure(expr.id)
@@ -484,7 +486,7 @@ fn check_loans_in_fn(fk: visit::fn_kind, decl: ast::fn_decl, body: ast::blk,
                      sp: span, id: ast::node_id, &&self: check_loan_ctxt,
                      visitor: visit::vt<check_loan_ctxt>) {
 
-    #debug["purity on entry=%?", self.declared_purity];
+    #debug["purity on entry=%?", copy self.declared_purity];
     save_and_restore(self.in_ctor) {||
         save_and_restore(self.declared_purity) {||
             save_and_restore(self.fn_args) {||
@@ -500,7 +502,7 @@ fn check_loans_in_fn(fk: visit::fn_kind, decl: ast::fn_decl, body: ast::blk,
                   visit::fk_ctor(*) {
                     self.in_ctor = true;
                     self.declared_purity = decl.purity;
-                    self.fn_args = decl.inputs.map({|i| i.id});
+                    self.fn_args = @decl.inputs.map({|i| i.id});
                   }
                   visit::fk_anon(*) |
                   visit::fk_fn_block(*) if is_stack_closure {
@@ -512,15 +514,15 @@ fn check_loans_in_fn(fk: visit::fn_kind, decl: ast::fn_decl, body: ast::blk,
                   visit::fk_res(*) | visit::fk_dtor(*) {
                     self.in_ctor = false;
                     self.declared_purity = decl.purity;
-                    self.fn_args = decl.inputs.map({|i| i.id});
+                    self.fn_args = @decl.inputs.map({|i| i.id});
                   }
                 }
 
                 visit::visit_fn(fk, decl, body, sp, id, self, visitor);
             }
         }
     }
-    #debug["purity on exit=%?", self.declared_purity];
+    #debug["purity on exit=%?", copy self.declared_purity];
 }
 
 fn check_loans_in_expr(expr: @ast::expr,

branches/try/src/rustc/middle/borrowck/gather_loans.rs

@@ -273,13 +273,14 @@ impl methods for gather_loan_ctxt {
         }
     }
 
-    fn add_loans(scope_id: ast::node_id, loans: @const [loan]) {
+    fn add_loans(scope_id: ast::node_id, loans: @dvec<loan>) {
         alt self.req_maps.req_loan_map.find(scope_id) {
           some(l) {
-            *l += [loans];
+            (*l).push(loans);
           }
           none {
-            self.req_maps.req_loan_map.insert(scope_id, @mut [loans]);
+            self.req_maps.req_loan_map.insert(
+                scope_id, @dvec::from_vec([mut loans]));
           }
         }
     }

branches/try/src/rustc/middle/borrowck/loan.rs

@@ -5,16 +5,16 @@
 export public_methods;
 
 impl public_methods for borrowck_ctxt {
-    fn loan(cmt: cmt, mutbl: ast::mutability) -> @const [loan] {
-        let lc = @{bccx: self, loans: @mut []};
+    fn loan(cmt: cmt, mutbl: ast::mutability) -> @dvec<loan> {
+        let lc = @{bccx: self, loans: @dvec()};
         lc.loan(cmt, mutbl);
         ret lc.loans;
     }
 }
 
 type loan_ctxt = @{
     bccx: borrowck_ctxt,
-    loans: @mut [loan]
+    loans: @dvec<loan>
 };
 
 impl loan_methods for loan_ctxt {
@@ -23,9 +23,9 @@ impl loan_methods for loan_ctxt {
         // Note: all cmt's that we deal with will have a non-none lp, because
         // the entry point into this routine, `borrowck_ctxt::loan()`, rejects
         // any cmt with a none-lp.
-        *self.loans += [{lp:option::get(cmt.lp),
-                         cmt:cmt,
-                         mutbl:mutbl}];
+        (*self.loans).push({lp:option::get(cmt.lp),
+                            cmt:cmt,
+                            mutbl:mutbl});
     }
 
     fn loan(cmt: cmt, req_mutbl: ast::mutability) {