Skip to content

Commit f2e1f8e

Browse files
committed
---
yaml --- r: 30891 b: refs/heads/incoming c: f311bb3 h: refs/heads/master i: 30889: 6cfb31b 30887: 8fb2079 v: v3
1 parent 60711f8 commit f2e1f8e

File tree

3 files changed

+5
-5
lines changed

3 files changed

+5
-5
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
88
refs/heads/try2: d0c6ce338884ee21843f4b40bf6bf18d222ce5df
9-
refs/heads/incoming: 84b058306472810edb4bc215cea621f1890b8b02
9+
refs/heads/incoming: f311bb38cd24a8c0f730ae104b6bdea8fb2880c5
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libcore/pipes.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ impl<T: Send> SharedChan<T>: Channel<T> {
11111111
}
11121112

11131113
/// Converts a `chan` into a `shared_chan`.
1114-
fn SharedChan<T:Send>(+c: Chan<T>) -> SharedChan<T> {
1114+
pub fn SharedChan<T:Send>(+c: Chan<T>) -> SharedChan<T> {
11151115
private::exclusive(move c)
11161116
}
11171117

branches/incoming/src/test/bench/graph500-bfs.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -231,8 +231,8 @@ fn pbfs(&&graph: arc::ARC<graph>, key: node_id) -> bfs_result {
231231
};
232232

233233
#[inline(always)]
234-
fn is_gray(c: color) -> bool {
235-
match c {
234+
fn is_gray(c: &color) -> bool {
235+
match *c {
236236
gray(_) => { true }
237237
_ => { false }
238238
}
@@ -282,7 +282,7 @@ fn pbfs(&&graph: arc::ARC<graph>, key: node_id) -> bfs_result {
282282

283283
// Convert the results.
284284
do par::map(colors) |c| {
285-
match c {
285+
match *c {
286286
white => { -1i64 }
287287
black(parent) => { parent }
288288
_ => { fail ~"Found remaining gray nodes in BFS" }

0 commit comments

Comments
 (0)