---

yaml
---
r: 15630
b: refs/heads/try
c: 929c3dd
h: refs/heads/master
v: v3

Author: graydon

[refs]

@@ -2,5 +2,5 @@
 refs/heads/master: 61b1875c16de39c166b0f4d54bba19f9c6777d1a
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 4a81779abd786ff22d71434c6d9a5917ea4cdfff
-refs/heads/try: e7dbf42214c5dfe39b8fd6896171aaa8feee7582
+refs/heads/try: 929c3dd7106fc21938e1406c7a6ee581664b9dfc
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

branches/try/src/cargo/cargo.rs

@@ -423,7 +423,10 @@ fn configure(opts: options) -> cargo {
 
 fn for_each_package(c: cargo, b: fn(source, package)) {
     for c.sources.each_value {|v|
-        for vec::each(copy v.packages) {|p|
+        // FIXME (#2280): this temporary shouldn't be
+        // necessary, but seems to be, for borrowing.
+        let pks = copy v.packages;
+        for vec::each(pks) {|p|
             b(v, p);
         }
     }

branches/try/src/rustc/middle/trans/base.rs

@@ -5096,7 +5096,10 @@ fn trans_crate(sess: session::session, crate: @ast::crate, tcx: ty::ctxt,
         io::println(#fmt("n_null_glues: %u", ccx.stats.n_null_glues));
         io::println(#fmt("n_real_glues: %u", ccx.stats.n_real_glues));
 
-        for vec::each(copy *ccx.stats.fn_times) {|timing|
+        // FIXME (#2280): this temporary shouldn't be
+        // necessary, but seems to be, for borrowing.
+        let times = copy *ccx.stats.fn_times;
+        for vec::each(times) {|timing|
             io::println(#fmt("time: %s took %d ms", timing.ident,
                              timing.time));
         }

branches/try/src/rustc/middle/tstate/auxiliary.rs

@@ -727,7 +727,10 @@ fn find_instances(_fcx: fn_ctxt, subst: subst, c: constraint) ->
     alt c {
       cinit(_, _, _) {/* this is dealt with separately */ }
       cpred(p, descs) {
-        for vec::each(copy *descs) {|d|
+        // FIXME (#2280): this temporary shouldn't be
+        // necessary, but seems to be, for borrowing.
+        let ds = copy *descs;
+        for vec::each(ds) {|d|
             if args_mention(d.node.args, find_in_subst_bool, subst) {
                 let old_bit_num = d.node.bit_num;
                 let newv = replace(subst, d);

branches/try/src/test/bench/shootout-mandelbrot.rs

@@ -119,7 +119,10 @@ fn writer(path: str, writech: comm::chan<comm::chan<line>>, size: uint)
             while prev <= i {
                 if lines.contains_key(prev) {
                     #debug("WS %u", prev);
-                    cout.write(lines.get(prev));
+                    // FIXME (#2280): this temporary shouldn't be
+                    // necessary, but seems to be, for borrowing.
+                    let v : [u8] = lines.get(prev);
+                    cout.write(v);
                     done += 1_u;
                     lines.remove(prev);
                     prev += 1_u;