Skip to content

Commit 21b0e18

Browse files
committed
---
yaml --- r: 40827 b: refs/heads/dist-snap c: a9601bc h: refs/heads/master i: 40825: 4910e9b 40823: e943c48 v: v3
1 parent dce9551 commit 21b0e18

File tree

6 files changed

+13
-13
lines changed

6 files changed

+13
-13
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: a810c03263670238bccd64cabb12a23a46e3a278
99
refs/heads/incoming: e90142e536c150df0d9b4b2f11352152177509b5
10-
refs/heads/dist-snap: 47faeb9228f10717de6879c6474cdcf988a9f316
10+
refs/heads/dist-snap: a9601bce10ac5d037b0d1ce532196f08f4b7fd95
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1313
refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/src/test/bench/graph500-bfs.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -188,7 +188,7 @@ fn bfs2(graph: graph, key: node_id) -> bfs_result {
188188
white => {
189189
let i = i as node_id;
190190

191-
let neighbors = graph[i];
191+
let neighbors = copy graph[i];
192192

193193
let mut color = white;
194194

@@ -269,7 +269,7 @@ fn pbfs(&&graph: arc::ARC<graph>, key: node_id) -> bfs_result {
269269
white => {
270270
let i = i as node_id;
271271

272-
let neighbors = graph[i];
272+
let neighbors = copy graph[i];
273273

274274
let mut color = white;
275275

@@ -438,7 +438,7 @@ fn main() {
438438

439439
if do_sequential {
440440
let start = time::precise_time_s();
441-
let bfs_tree = bfs(graph, *root);
441+
let bfs_tree = bfs(copy graph, *root);
442442
let stop = time::precise_time_s();
443443

444444
//total_seq += stop - start;
@@ -449,7 +449,7 @@ fn main() {
449449

450450
if do_validate {
451451
let start = time::precise_time_s();
452-
assert(validate(edges, *root, bfs_tree));
452+
assert(validate(copy edges, *root, bfs_tree));
453453
let stop = time::precise_time_s();
454454

455455
io::stdout().write_line(
@@ -458,7 +458,7 @@ fn main() {
458458
}
459459

460460
let start = time::precise_time_s();
461-
let bfs_tree = bfs2(graph, *root);
461+
let bfs_tree = bfs2(copy graph, *root);
462462
let stop = time::precise_time_s();
463463

464464
total_seq += stop - start;
@@ -469,7 +469,7 @@ fn main() {
469469

470470
if do_validate {
471471
let start = time::precise_time_s();
472-
assert(validate(edges, *root, bfs_tree));
472+
assert(validate(copy edges, *root, bfs_tree));
473473
let stop = time::precise_time_s();
474474

475475
io::stdout().write_line(
@@ -489,7 +489,7 @@ fn main() {
489489

490490
if do_validate {
491491
let start = time::precise_time_s();
492-
assert(validate(edges, *root, bfs_tree));
492+
assert(validate(copy edges, *root, bfs_tree));
493493
let stop = time::precise_time_s();
494494

495495
io::stdout().write_line(fmt!("Validation completed in %? seconds.",

branches/dist-snap/src/test/bench/shootout-chameneos-redux.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -132,7 +132,7 @@ fn creature(
132132
133133
fn rendezvous(nn: uint, set: ~[color]) {
134134
135-
pub fn spawn_listener<A: Send>(+f: fn~(oldcomm::Port<A>)) -> oldcomm::Chan<A> {
135+
pub fn spawn_listener<A: Owned>(+f: fn~(oldcomm::Port<A>)) -> oldcomm::Chan<A> {
136136
let setup_po = oldcomm::Port();
137137
let setup_ch = oldcomm::Chan(&setup_po);
138138
do task::spawn |move f| {

branches/dist-snap/src/test/bench/shootout-fasta.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,7 @@ fn make_random_fasta(wr: io::Writer, id: ~str, desc: ~str, genelist: ~[aminoacid
5555
let mut op: ~str = ~"";
5656
for uint::range(0u, n as uint) |_i| {
5757
str::push_char(&mut op, select_random(myrandom_next(rng, 100u32),
58-
genelist));
58+
copy genelist));
5959
if str::len(op) >= LINE_LENGTH() {
6060
wr.write_line(op);
6161
op = ~"";

branches/dist-snap/src/test/bench/shootout-k-nucleotide-pipes.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ fn sort_and_fmt(mm: HashMap<~[u8], uint>, total: uint) -> ~str {
5959
let mut buffer = ~"";
6060

6161
for pairs_sorted.each |kv| {
62-
let (k,v) = *kv;
62+
let (k,v) = copy *kv;
6363
unsafe {
6464
buffer += (fmt!("%s %0.3f\n", str::to_upper(str::raw::from_bytes(k)), v));
6565
}
@@ -198,7 +198,7 @@ fn main() {
198198
let line_bytes = str::to_bytes(line);
199199

200200
for sizes.eachi |ii, _sz| {
201-
let mut lb = line_bytes;
201+
let mut lb = copy line_bytes;
202202
to_child[ii].send(lb);
203203
}
204204
}

branches/dist-snap/src/test/bench/task-perf-word-count-generic.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ mod map_reduce {
164164
let ctrl = box(move ctrl);
165165
let i = copy *i;
166166
let m = copy *map;
167-
tasks.push(spawn_joinable(|move ctrl, move i| map_task(m, &ctrl, i)));
167+
tasks.push(spawn_joinable(|move ctrl, move i| map_task(copy m, &ctrl, i)));
168168
ctrls.push(move ctrl_server);
169169
}
170170
move tasks

0 commit comments

Comments
 (0)