---

yaml
---
r: 44712
b: refs/heads/master
c: 9ac5262
h: refs/heads/master
v: v3

Author: erickt

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 297c6e11bb362901b5a511057497a80eb255d2b4
+refs/heads/master: 9ac5262bdf27c964d1e9496479994aff2ae80acc
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: a6d9689399d091c3265f00434a69c551a61c28dc
 refs/heads/try: ef355f6332f83371e4acf04fc4eb940ab41d78d3

trunk/src/librustc/middle/borrowck/check_loans.rs

@@ -579,7 +579,7 @@ impl CheckLoanCtxt {
     }
 }
 
-fn check_loans_in_fn(fk: visit::fn_kind,
+fn check_loans_in_fn(fk: &visit::fn_kind,
                      decl: ast::fn_decl,
                      body: ast::blk,
                      sp: span,
@@ -590,7 +590,7 @@ fn check_loans_in_fn(fk: visit::fn_kind,
     let fty = ty::node_id_to_type(self.tcx(), id);
 
     let declared_purity;
-    match fk {
+    match *fk {
         visit::fk_item_fn(*) | visit::fk_method(*) |
         visit::fk_dtor(*) => {
             declared_purity = ty::ty_fn_purity(fty);
@@ -611,7 +611,7 @@ fn check_loans_in_fn(fk: visit::fn_kind,
         do save_and_restore_managed(self.fn_args) {
             *self.declared_purity = declared_purity;
 
-            match fk {
+            match *fk {
                 visit::fk_anon(*) |
                 visit::fk_fn_block(*) if is_stack_closure => {
                     // inherits the fn_args from enclosing ctxt

trunk/src/librustc/middle/borrowck/gather_loans.rs

@@ -95,7 +95,7 @@ pub fn gather_loans(bccx: @BorrowckCtxt, crate: @ast::crate) -> ReqMaps {
     return glcx.req_maps;
 }
 
-fn req_loans_in_fn(fk: visit::fn_kind,
+fn req_loans_in_fn(fk: &visit::fn_kind,
                    decl: ast::fn_decl,
                    body: ast::blk,
                    sp: span,
@@ -107,7 +107,7 @@ fn req_loans_in_fn(fk: visit::fn_kind,
     let old_root_ub = self.root_ub;
     self.root_ub = body.node.id;
 
-    match fk {
+    match *fk {
         visit::fk_anon(*) | visit::fk_fn_block(*) => {}
         visit::fk_item_fn(*) | visit::fk_method(*) |
         visit::fk_dtor(*) => {

trunk/src/librustc/middle/check_match.rs

@@ -669,7 +669,7 @@ pub fn check_local(cx: @MatchCheckCtxt,
 }
 
 pub fn check_fn(cx: @MatchCheckCtxt,
-                kind: visit::fn_kind,
+                kind: &visit::fn_kind,
                 decl: fn_decl,
                 body: blk,
                 sp: span,

trunk/src/librustc/middle/freevars.rs

@@ -100,7 +100,7 @@ pub fn annotate_freevars(def_map: resolve::DefMap, crate: @ast::crate) ->
    freevar_map {
     let freevars = HashMap();
 
-    let walk_fn = fn@(_fk: visit::fn_kind, _decl: ast::fn_decl,
+    let walk_fn = fn@(_fk: &visit::fn_kind, _decl: ast::fn_decl,
                       blk: ast::blk, _sp: span, nid: ast::node_id) {
         let vars = collect_freevars(def_map, blk);
         freevars.insert(nid, vars);

trunk/src/librustc/middle/kind.rs

@@ -153,7 +153,7 @@ fn with_appropriate_checker(cx: Context, id: node_id, b: fn(check_fn)) {
 
 // Check that the free variables used in a shared/sendable closure conform
 // to the copy/move kind bounds. Then recursively check the function body.
-fn check_fn(fk: visit::fn_kind, decl: fn_decl, body: blk, sp: span,
+fn check_fn(fk: &visit::fn_kind, decl: fn_decl, body: blk, sp: span,
             fn_id: node_id, cx: Context, v: visit::vt<Context>) {
 
     // Check kinds on free variables:

trunk/src/librustc/middle/lint.rs

@@ -923,13 +923,13 @@ fn check_item_non_camel_case_types(cx: ty::ctxt, it: @ast::item) {
     }
 }
 
-fn check_fn(tcx: ty::ctxt, fk: visit::fn_kind, decl: ast::fn_decl,
+fn check_fn(tcx: ty::ctxt, fk: &visit::fn_kind, decl: ast::fn_decl,
             _body: ast::blk, span: span, id: ast::node_id) {
     debug!("lint check_fn fk=%? id=%?", fk, id);
 
     // don't complain about blocks, since they tend to get their modes
     // specified from the outside
-    match fk {
+    match *fk {
       visit::fk_fn_block(*) => { return; }
       _ => {}
     }

trunk/src/librustc/middle/liveness.rs

@@ -435,7 +435,7 @@ impl IrMaps {
     }
 }
 
-fn visit_fn(fk: visit::fn_kind,
+fn visit_fn(fk: &visit::fn_kind,
             decl: fn_decl,
             body: blk,
             sp: span,
@@ -465,7 +465,7 @@ fn visit_fn(fk: visit::fn_kind,
     };
 
     // Add `self`, whether explicit or implicit.
-    match fk {
+    match *fk {
         fk_method(_, _, method) => {
             match method.self_ty.node {
                 sty_by_ref => {
@@ -1639,7 +1639,7 @@ fn check_expr(expr: @expr, &&self: @Liveness, vt: vt<@Liveness>) {
     }
 }
 
-fn check_fn(_fk: visit::fn_kind, _decl: fn_decl,
+fn check_fn(_fk: &visit::fn_kind, _decl: fn_decl,
             _body: blk, _sp: span, _id: node_id,
             &&_self: @Liveness, _v: vt<@Liveness>) {
     // do not check contents of nested fns
@@ -1653,7 +1653,7 @@ enum ReadKind {
 }
 
 impl @Liveness {
-    fn check_ret(&self, id: node_id, sp: span, _fk: visit::fn_kind,
+    fn check_ret(&self, id: node_id, sp: span, _fk: &visit::fn_kind,
                  entry_ln: LiveNode) {
         if self.live_on_entry(entry_ln, self.s.no_ret_var).is_some() {
             // if no_ret_var is live, then we fall off the end of the

trunk/src/librustc/middle/region.rs

@@ -316,14 +316,14 @@ pub fn resolve_item(item: @ast::item, cx: ctxt, visitor: visit::vt<ctxt>) {
     visit::visit_item(item, new_cx, visitor);
 }
 
-pub fn resolve_fn(fk: visit::fn_kind,
+pub fn resolve_fn(fk: &visit::fn_kind,
                   decl: ast::fn_decl,
                   body: ast::blk,
                   sp: span,
                   id: ast::node_id,
                   cx: ctxt,
                   visitor: visit::vt<ctxt>) {
-    let fn_cx = match fk {
+    let fn_cx = match *fk {
         visit::fk_item_fn(*) | visit::fk_method(*) |
         visit::fk_dtor(*) => {
             // Top-level functions are a root scope.
@@ -337,7 +337,7 @@ pub fn resolve_fn(fk: visit::fn_kind,
     };
 
     // Record the ID of `self`.
-    match fk {
+    match *fk {
         visit::fk_method(_, _, method) => {
             cx.region_map.insert(method.self_id, body.node.id);
         }
@@ -607,7 +607,7 @@ pub fn determine_rp_in_item(item: @ast::item,
     }
 }
 
-pub fn determine_rp_in_fn(fk: visit::fn_kind,
+pub fn determine_rp_in_fn(fk: &visit::fn_kind,
                           decl: ast::fn_decl,
                           body: ast::blk,
                           _: span,

trunk/src/librustc/middle/resolve.rs

@@ -1079,7 +1079,7 @@ pub impl Resolver {
         let privacy = visibility_to_privacy(item.vis);
 
         match /*bad*/copy item.node {
-            item_mod(module_) => {
+            item_mod(ref module_) => {
                 let (name_bindings, new_parent) =
                     self.add_child(ident, parent, ForbidDuplicateModules, sp);
 
@@ -3725,7 +3725,7 @@ pub impl Resolver {
                                    visitor);
             }
 
-            item_mod(module_) => {
+            item_mod(ref module_) => {
                 do self.with_scope(Some(item.ident)) {
                     self.resolve_module(module_, item.span, item.ident,
                                         item.id, visitor);
@@ -4098,7 +4098,7 @@ pub impl Resolver {
     }
 
     fn resolve_module(@mut self,
-                      module_: _mod,
+                      module_: &_mod,
                       span: span,
                       _name: ident,
                       id: node_id,

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

@@ -3008,8 +3008,12 @@ pub fn trans_crate(sess: session::Session,
     let symbol_hasher = @hash::default_state();
     let link_meta =
         link::build_link_meta(sess, crate, output, symbol_hasher);
-    let reachable = reachable::find_reachable(crate.node.module, emap2, tcx,
-                                              maps.method_map);
+    let reachable = reachable::find_reachable(
+        &crate.node.module,
+        emap2,
+        tcx,
+        maps.method_map
+    );
 
     // Append ".rc" to crate name as LLVM module identifier.
     //

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

@@ -38,7 +38,7 @@ struct ctx {
     rmap: map
 }
 
-pub fn find_reachable(crate_mod: _mod, exp_map2: resolve::ExportMap2,
+pub fn find_reachable(crate_mod: &_mod, exp_map2: resolve::ExportMap2,
                       tcx: ty::ctxt, method_map: typeck::method_map) -> map {
     let rmap = HashMap();
     let cx = ctx {
@@ -85,10 +85,10 @@ fn traverse_def_id(cx: ctx, did: def_id) {
     }
 }
 
-fn traverse_public_mod(cx: ctx, mod_id: node_id, m: _mod) {
+fn traverse_public_mod(cx: ctx, mod_id: node_id, m: &_mod) {
     if !traverse_exports(cx, mod_id) {
         // No exports, so every local item is exported
-        for vec::each(m.items) |item| {
+        for m.items.each |item| {
             traverse_public_item(cx, *item);
         }
     }
@@ -98,10 +98,10 @@ fn traverse_public_item(cx: ctx, item: @item) {
     if cx.rmap.contains_key(&item.id) { return; }
     cx.rmap.insert(item.id, ());
     match /*bad*/copy item.node {
-      item_mod(m) => traverse_public_mod(cx, item.id, m),
+      item_mod(ref m) => traverse_public_mod(cx, item.id, m),
       item_foreign_mod(nm) => {
           if !traverse_exports(cx, item.id) {
-              for vec::each(nm.items) |item| {
+              for nm.items.each |item| {
                   cx.rmap.insert(item.id, ());
               }
           }
@@ -224,9 +224,12 @@ fn traverse_inline_body(cx: ctx, body: blk) {
     }));
 }
 
-fn traverse_all_resources_and_impls(cx: ctx, crate_mod: _mod) {
+fn traverse_all_resources_and_impls(cx: ctx, crate_mod: &_mod) {
     visit::visit_mod(
-        crate_mod, codemap::dummy_sp(), 0, cx,
+        crate_mod,
+        codemap::dummy_sp(),
+        0,
+        cx,
         visit::mk_vt(@visit::Visitor {
             visit_expr: |_e, _cx, _v| { },
             visit_item: |i, cx, v| {

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

@@ -469,7 +469,7 @@ pub fn check_fn(ccx: @mut CrateCtxt,
         };
 
         // Don't descend into fns and items
-        fn visit_fn(_fk: visit::fn_kind, _decl: ast::fn_decl,
+        fn visit_fn(_fk: &visit::fn_kind, _decl: ast::fn_decl,
                     _body: ast::blk, _sp: span,
                     _id: ast::node_id, &&_t: (), _v: visit::vt<()>) {
         }

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

@@ -628,7 +628,7 @@ pub impl CoherenceChecker {
         visit_crate(*crate, (), mk_vt(@Visitor {
             visit_item: |item, _context, visitor| {
                 match /*bad*/copy item.node {
-                    item_mod(module_) => {
+                    item_mod(ref module_) => {
                         // Then visit the module items.
                         visit_mod(module_, item.span, item.id, (), visitor);
                     }