---

yaml
---
r: 30514
b: refs/heads/incoming
c: 7e56612
h: refs/heads/master
v: v3

Author: nikomatsakis

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
-refs/heads/incoming: 308ca06012df2fe26c528efc354f975970e5def5
+refs/heads/incoming: 7e5661214ad3cc00d40a993cf93b08f8db5d8cac
 refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

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

@@ -118,7 +118,7 @@ fn writer(path: ~str, writech: comm::Chan<comm::Chan<line>>, size: uint)
     };
     cout.write_line(~"P4");
     cout.write_line(fmt!("%u %u", size, size));
-    let lines = std::map::uint_hash();
+    let lines: HashMap<uint, ~[u8]> = std::map::uint_hash();
     let mut done = 0_u;
     let mut i = 0_u;
     while i < size {
@@ -131,10 +131,7 @@ fn writer(path: ~str, writech: comm::Chan<comm::Chan<line>>, size: uint)
             while prev <= i {
                 if lines.contains_key(prev) {
                     debug!("WS %u", prev);
-                    // FIXME (#2280): this temporary shouldn't be
-                    // necessary, but seems to be, for borrowing.
-                    let v : ~[u8] = lines.get(prev);
-                    cout.write(v);
+                    cout.write(lines.get(prev));
                     done += 1_u;
                     lines.remove(prev);
                     prev += 1_u;