---

yaml
---
r: 22724
b: refs/heads/master
c: 7022ede
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 3bcd9734190858050e544d103d7bd44f138ad949
+refs/heads/master: 7022ede9b338fcd7429977c4cd0d01ca76aecb5f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
 refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/rustc/middle/borrowck/categorization.rs

@@ -97,7 +97,7 @@ fn deref_kind(tcx: ty::ctxt, t: ty::t) -> deref_kind {
 
 impl public_methods for borrowck_ctxt {
     fn cat_borrow_of_expr(expr: @ast::expr) -> cmt {
-        // a borrowed expression must be either an @, ~, or a vec/@, vec/~
+        // a borrowed expression must be either an @, ~, or a @vec, ~vec
         let expr_ty = ty::expr_ty(self.tcx, expr);
         alt ty::get(expr_ty).struct {
           ty::ty_evec(*) | ty::ty_estr(*) {
@@ -109,6 +109,12 @@ impl public_methods for borrowck_ctxt {
             self.cat_deref(expr, cmt, 0u, true).get()
           }
 
+          /*
+          ty::ty_fn({proto, _}) {
+            self.cat_call(expr, expr, proto)
+          }
+          */
+
           _ {
             self.tcx.sess.span_bug(
                 expr.span,
@@ -341,9 +347,20 @@ impl public_methods for borrowck_ctxt {
                     }
                 };
 
+                // for unique ptrs, we inherit mutability from the
+                // owning reference.
+                let m = alt ptr {
+                  uniq_ptr => {
+                    self.inherited_mutability(base_cmt.mutbl, mt.mutbl)
+                  }
+                  gc_ptr | region_ptr | unsafe_ptr => {
+                    mt.mutbl
+                  }
+                };
+
                 @{id:node.id(), span:node.span(),
                   cat:cat_deref(base_cmt, derefs, ptr), lp:lp,
-                  mutbl:mt.mutbl, ty:mt.ty}
+                  mutbl:m, ty:mt.ty}
               }
 
               deref_comp(comp) {
@@ -379,27 +396,38 @@ impl public_methods for borrowck_ctxt {
               _ => {none}
             };
 
-            // (b) the deref is explicit in the resulting cmt
+            // (b) for unique ptrs, we inherit mutability from the
+            // owning reference.
+            let m = alt ptr {
+              uniq_ptr => {
+                self.inherited_mutability(base_cmt.mutbl, mt.mutbl)
+              }
+              gc_ptr | region_ptr | unsafe_ptr => {
+                mt.mutbl
+              }
+            };
+
+            // (c) the deref is explicit in the resulting cmt
             let deref_cmt = @{id:expr.id, span:expr.span,
               cat:cat_deref(base_cmt, 0u, ptr), lp:deref_lp,
-              mutbl:m_imm, ty:mt.ty};
+              mutbl:m, ty:mt.ty};
 
-            comp(expr, deref_cmt, base_cmt.ty, mt)
+            comp(expr, deref_cmt, base_cmt.ty, m, mt.ty)
           }
 
           deref_comp(_) {
             // fixed-length vectors have no deref
-            comp(expr, base_cmt, base_cmt.ty, mt)
+            comp(expr, base_cmt, base_cmt.ty, mt.mutbl, mt.ty)
           }
         };
 
         fn comp(expr: @ast::expr, of_cmt: cmt,
-                vect: ty::t, mt: ty::mt) -> cmt {
-            let comp = comp_index(vect, mt.mutbl);
+                vect: ty::t, mutbl: ast::mutability, ty: ty::t) -> cmt {
+            let comp = comp_index(vect, mutbl);
             let index_lp = of_cmt.lp.map(|lp| @lp_comp(lp, comp) );
             @{id:expr.id, span:expr.span,
               cat:cat_comp(of_cmt, comp), lp:index_lp,
-              mutbl:mt.mutbl, ty:mt.ty}
+              mutbl:mutbl, ty:ty}
         }
     }