---

yaml
---
r: 147597
b: refs/heads/try2
c: eb9eade
h: refs/heads/master
i:
  147595: 73a7e0b
v: v3

Author: pcwalton

[refs]

@@ -5,7 +5,7 @@ refs/heads/snap-stage3: 78a7676898d9f80ab540c6df5d4c9ce35bb50463
 refs/heads/try: 519addf6277dbafccbb4159db4b710c37eaa2ec5
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
-refs/heads/try2: 2fa456d4f4980eba1d8efa23e7290dcefb4346d4
+refs/heads/try2: eb9eade1dfe98301b68b8970a642034e6aa8bbe3
 refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try2/src/librustc/middle/freevars.rs

@@ -33,8 +33,8 @@ pub type freevar_info = @~[@freevar_entry];
 pub type freevar_map = @mut HashMap<ast::NodeId, freevar_info>;
 
 struct CollectFreevarsVisitor {
-    seen: @mut HashMap<ast::NodeId, ()>,
-    refs: @mut ~[@freevar_entry],
+    seen: HashMap<ast::NodeId, ()>,
+    refs: ~[@freevar_entry],
     def_map: resolve::DefMap,
 }
 
@@ -90,8 +90,8 @@ impl Visitor<int> for CollectFreevarsVisitor {
 // in order to start the search.
 fn collect_freevars(def_map: resolve::DefMap, blk: ast::P<ast::Block>)
     -> freevar_info {
-    let seen = @mut HashMap::new();
-    let refs = @mut ~[];
+    let seen = HashMap::new();
+    let refs = ~[];
 
     let mut v = CollectFreevarsVisitor {
         seen: seen,
@@ -100,7 +100,11 @@ fn collect_freevars(def_map: resolve::DefMap, blk: ast::P<ast::Block>)
     };
 
     v.visit_block(blk, 1);
-    return @(*refs).clone();
+    let CollectFreevarsVisitor {
+        refs,
+        ..
+    } = v;
+    return @refs;
 }
 
 struct AnnotateFreevarsVisitor {