Skip to content

Commit 8e26040

Browse files
committed
---
yaml --- r: 29755 b: refs/heads/incoming c: 78d19d8 h: refs/heads/master i: 29753: 8c79275 29751: f24a0c4 v: v3
1 parent 625fdb4 commit 8e26040

File tree

3 files changed

+6
-5
lines changed

3 files changed

+6
-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: 9169a1b26a556bbd5befd344a5b0912901859e5d
9+
refs/heads/incoming: 78d19d8f1bdb64317ebdb072c25ee1240a562095
1010
refs/heads/dist-snap: 2f32a1581f522e524009138b33b1c7049ced668d
1111
refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
1212
refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/incoming/src/libstd/cell.rs

Lines changed: 3 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -18,18 +18,18 @@ fn empty_cell<T>() -> Cell<T> {
1818
impl<T> Cell<T> {
1919
/// Yields the value, failing if the cell is empty.
2020
fn take() -> T {
21-
let value = none;
21+
let mut value = none;
2222
value <-> self.value;
2323
if value.is_none() {
24-
fail "attempt to take an empty cell";
24+
fail ~"attempt to take an empty cell";
2525
}
2626
return option::unwrap(value);
2727
}
2828

2929
/// Returns the value, failing if the cell is full.
3030
fn put_back(+value: T) {
3131
if self.value.is_none() {
32-
fail "attempt to put a value back into a full cell";
32+
fail ~"attempt to put a value back into a full cell";
3333
}
3434
self.value = some(move value);
3535
}
@@ -39,4 +39,3 @@ impl<T> Cell<T> {
3939
self.value.is_none()
4040
}
4141
}
42-

branches/incoming/src/libstd/std.rc

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,7 @@ export ebml, dbg, getopts, json, rand, sha1, term, time, prettyprint;
2626
export test, tempfile, serialization;
2727
export cmp;
2828
export base64;
29+
export cell;
2930

3031
// General io and system-services modules
3132

@@ -45,6 +46,7 @@ mod uv_global_loop;
4546

4647
mod c_vec;
4748
mod timer;
49+
mod cell;
4850

4951
// Concurrency
5052

0 commit comments

Comments
 (0)