Skip to content

Commit 8503d5a

Browse files
committed
---
yaml --- r: 28492 b: refs/heads/try c: 7e56612 h: refs/heads/master v: v3
1 parent 802ffc5 commit 8503d5a

File tree

2 files changed

+3
-6
lines changed

2 files changed

+3
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
5-
refs/heads/try: 308ca06012df2fe26c528efc354f975970e5def5
5+
refs/heads/try: 7e5661214ad3cc00d40a993cf93b08f8db5d8cac
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df

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

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -118,7 +118,7 @@ fn writer(path: ~str, writech: comm::Chan<comm::Chan<line>>, size: uint)
118118
};
119119
cout.write_line(~"P4");
120120
cout.write_line(fmt!("%u %u", size, size));
121-
let lines = std::map::uint_hash();
121+
let lines: HashMap<uint, ~[u8]> = std::map::uint_hash();
122122
let mut done = 0_u;
123123
let mut i = 0_u;
124124
while i < size {
@@ -131,10 +131,7 @@ fn writer(path: ~str, writech: comm::Chan<comm::Chan<line>>, size: uint)
131131
while prev <= i {
132132
if lines.contains_key(prev) {
133133
debug!("WS %u", prev);
134-
// FIXME (#2280): this temporary shouldn't be
135-
// necessary, but seems to be, for borrowing.
136-
let v : ~[u8] = lines.get(prev);
137-
cout.write(v);
134+
cout.write(lines.get(prev));
138135
done += 1_u;
139136
lines.remove(prev);
140137
prev += 1_u;

0 commit comments

Comments
 (0)