Add is_mutbl field to def_arg

Author: sanxiyn

src/librustc/middle/astencode.rs

@@ -415,7 +415,7 @@ impl ast::def: tr {
           ast::def_mod(did) => { ast::def_mod(did.tr(xcx)) }
           ast::def_foreign_mod(did) => { ast::def_foreign_mod(did.tr(xcx)) }
           ast::def_const(did) => { ast::def_const(did.tr(xcx)) }
-          ast::def_arg(nid, m) => { ast::def_arg(xcx.tr_id(nid), m) }
+          ast::def_arg(nid, m, b) => { ast::def_arg(xcx.tr_id(nid), m, b) }
           ast::def_local(nid, b) => { ast::def_local(xcx.tr_id(nid), b) }
           ast::def_variant(e_did, v_did) => {
             ast::def_variant(e_did.tr(xcx), v_did.tr(xcx))

src/librustc/middle/liveness.rs

@@ -286,7 +286,7 @@ enum VarKind {
 fn relevant_def(def: def) -> Option<node_id> {
     match def {
       def_binding(nid, _) |
-      def_arg(nid, _) |
+      def_arg(nid, _, _) |
       def_local(nid, _) |
       def_self(nid, _) => Some(nid),
 

src/librustc/middle/mem_categorization.rs

@@ -453,7 +453,7 @@ impl &mem_categorization_ctxt {
               mutbl:m_imm, ty:expr_ty}
           }
 
-          ast::def_arg(vid, mode) => {
+          ast::def_arg(vid, mode, _) => {
             // Idea: make this could be rewritten to model by-ref
             // stuff as `&const` and `&mut`?
 

src/librustc/middle/resolve.rs

@@ -4561,7 +4561,8 @@ impl Resolver {
                                 }
                                 ArgumentIrrefutableMode(argument_mode) => {
                                     // And for function arguments, `def_arg`.
-                                    def_arg(pattern.id, argument_mode)
+                                    def_arg(pattern.id, argument_mode,
+                                            is_mutable)
                                 }
                             };
 

src/librustc/middle/trans/expr.rs

@@ -854,7 +854,7 @@ fn trans_local_var(bcx: block,
                 }
             }
         }
-        ast::def_arg(nid, _) => {
+        ast::def_arg(nid, _, _) => {
             take_local(bcx, bcx.fcx.llargs, nid, expr_id_opt)
         }
         ast::def_local(nid, _) | ast::def_binding(nid, _) => {

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

@@ -2818,7 +2818,7 @@ fn ty_param_bounds_and_ty_for_def(fcx: @fn_ctxt, sp: span, defn: ast::def) ->
     ty_param_bounds_and_ty {
 
     match defn {
-      ast::def_arg(nid, _) | ast::def_local(nid, _) |
+      ast::def_arg(nid, _, _) | ast::def_local(nid, _) |
       ast::def_self(nid, _) | ast::def_binding(nid, _) => {
         assert (fcx.inh.locals.contains_key(nid));
         let typ = ty::mk_var(fcx.ccx.tcx, lookup_local(fcx, sp, nid));

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

@@ -55,8 +55,8 @@ type rvt = visit::vt<@rcx>;
 fn encl_region_of_def(fcx: @fn_ctxt, def: ast::def) -> ty::Region {
     let tcx = fcx.tcx();
     match def {
-        def_local(node_id, _) | def_arg(node_id, _) | def_self(node_id, _) |
-        def_binding(node_id, _) =>
+        def_local(node_id, _) | def_arg(node_id, _, _) |
+        def_self(node_id, _) | def_binding(node_id, _) =>
             return encl_region(tcx, node_id),
         def_upvar(_, subdef, closure_id, body_id) => {
             match ty_fn_proto(fcx.node_ty(closure_id)) {

src/libsyntax/ast.rs

@@ -139,7 +139,7 @@ enum def {
     def_mod(def_id),
     def_foreign_mod(def_id),
     def_const(def_id),
-    def_arg(node_id, mode),
+    def_arg(node_id, mode, bool /* is_mutbl */),
     def_local(node_id, bool /* is_mutbl */),
     def_variant(def_id /* enum */, def_id /* variant */),
     def_ty(def_id),
@@ -203,9 +203,10 @@ impl def : cmp::Eq {
                     _ => false
                 }
             }
-            def_arg(e0a, e1a) => {
+            def_arg(e0a, e1a, e2a) => {
                 match (*other) {
-                    def_arg(e0b, e1b) => e0a == e0b && e1a == e1b,
+                    def_arg(e0b, e1b, e2b) =>
+                        e0a == e0b && e1a == e1b && e2a == e2b,
                     _ => false
                 }
             }

src/libsyntax/ast_util.rs

@@ -86,7 +86,7 @@ pure fn def_id_of_def(d: def) -> def_id {
       def_use(id) | def_struct(id) => {
         id
       }
-      def_arg(id, _) | def_local(id, _) | def_self(id, _) | def_self_ty(id)
+      def_arg(id, _, _) | def_local(id, _) | def_self(id, _) | def_self_ty(id)
       | def_upvar(id, _, _, _) | def_binding(id, _) | def_region(id)
       | def_typaram_binder(id) | def_label(id) => {
         local_def(id)