---

yaml
---
r: 58773
b: refs/heads/try
c: e235f6c
h: refs/heads/master
i:
  58771: feae79e
v: v3

Author: nikomatsakis

[refs]

@@ -2,7 +2,7 @@
 refs/heads/master: c081ffbd1e845687202a975ea2e698b623e5722f
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 213f7b24ccd9a6833af7e1a329c5e7ffc8f9e3d2
-refs/heads/try: 4dc62dfcf35bda8c8edf424c6c50f8584f554217
+refs/heads/try: e235f6ca53bac14158a6320aab49f31bd8e8bbe0
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c

branches/try/src/librustc/back/link.rs

@@ -788,7 +788,7 @@ pub fn link_binary(sess: Session,
     };
 
     debug!("output: %s", output.to_str());
-    let mut cc_args = link_args(sess, obj_filename, out_filename, lm);
+    let cc_args = link_args(sess, obj_filename, out_filename, lm);
     debug!("%s link args: %s", cc_prog, str::connect(cc_args, ~" "));
     // We run 'cc' here
     let prog = run::program_output(cc_prog, cc_args);

branches/try/src/librustc/middle/trans/closure.rs

@@ -208,7 +208,6 @@ pub fn store_environment(bcx: block,
 
     // allocate closure in the heap
     let Result {bcx: bcx, val: llbox} = allocate_cbox(bcx, sigil, cdata_ty);
-    let mut temp_cleanups = ~[];
 
     // cbox_ty has the form of a tuple: (a, b, c) we want a ptr to a
     // tuple.  This could be a ptr in uniq or a box or on stack,
@@ -244,9 +243,6 @@ pub fn store_environment(bcx: block,
         }
 
     }
-    for vec::each(temp_cleanups) |cleanup| {
-        revoke_clean(bcx, *cleanup);
-    }
 
     ClosureResult { llbox: llbox, cdata_ty: cdata_ty, bcx: bcx }
 }

branches/try/src/librustc/middle/trans/reachable.rs

@@ -42,7 +42,7 @@ pub fn find_reachable(crate_mod: &_mod, exp_map2: resolve::ExportMap2,
                       tcx: ty::ctxt, method_map: typeck::method_map) -> map {
     let mut rmap = HashSet::new();
     {
-        let mut cx = @mut ctx {
+        let cx = @mut ctx {
             exp_map2: exp_map2,
             tcx: tcx,
             method_map: method_map,

branches/try/src/librustc/middle/ty.rs

@@ -1950,7 +1950,7 @@ pub fn type_contents(cx: ctxt, ty: t) -> TypeContents {
 
         let _i = indenter();
 
-        let mut result = match get(ty).sty {
+        let result = match get(ty).sty {
             // Scalar and unique types are sendable, constant, and owned
             ty_nil | ty_bot | ty_bool | ty_int(_) | ty_uint(_) | ty_float(_) |
             ty_bare_fn(_) | ty_ptr(_) => {