diff options
| author | bors <bors@rust-lang.org> | 2013-05-10 03:04:51 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2013-05-10 03:04:51 -0700 |
| commit | 6da2c989ba88dc4e6b49ddd086699404bf93916f (patch) | |
| tree | f7c55c4091ea7c5f05f52e2810ec3ec638bff2e5 /src/libstd | |
| parent | e9d0018abf8dd0c692db4cfe8f5d1bd1c150d643 (diff) | |
| parent | 4400bbd72a18b5f034a5c43c29af87e1e453c2cb (diff) | |
| download | rust-6da2c989ba88dc4e6b49ddd086699404bf93916f.tar.gz rust-6da2c989ba88dc4e6b49ddd086699404bf93916f.zip | |
auto merge of #6329 : sonwow/rust/issue-6306, r=ILyoan
Fix for #6306
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/rl.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sort.rs | 4 | ||||
| -rw-r--r-- | src/libstd/sort_stage0.rs | 4 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/libstd/rl.rs b/src/libstd/rl.rs index b2407be0b99..81152430e78 100644 --- a/src/libstd/rl.rs +++ b/src/libstd/rl.rs @@ -69,11 +69,11 @@ fn complete_key(_v: @CompletionCb) {} /// Bind to the main completion callback pub unsafe fn complete(cb: CompletionCb) { - task::local_data::local_data_set(complete_key, @(cb)); + local_data::local_data_set(complete_key, @(cb)); extern fn callback(line: *c_char, completions: *()) { unsafe { - let cb = *task::local_data::local_data_get(complete_key) + let cb = *local_data::local_data_get(complete_key) .get(); do cb(str::raw::from_c_str(line)) |suggestion| { diff --git a/src/libstd/sort.rs b/src/libstd/sort.rs index ae474e0c394..fdc74be1335 100644 --- a/src/libstd/sort.rs +++ b/src/libstd/sort.rs @@ -1211,11 +1211,11 @@ mod big_tests { #[unsafe_destructor] impl<'self> Drop for LVal<'self> { fn finalize(&self) { - let x = unsafe { task::local_data::local_data_get(self.key) }; + let x = unsafe { local_data::local_data_get(self.key) }; match x { Some(@y) => { unsafe { - task::local_data::local_data_set(self.key, @(y+1)); + local_data::local_data_set(self.key, @(y+1)); } } _ => fail!(~"Expected key to work"), diff --git a/src/libstd/sort_stage0.rs b/src/libstd/sort_stage0.rs index 044c616dcd3..2379e4617aa 100644 --- a/src/libstd/sort_stage0.rs +++ b/src/libstd/sort_stage0.rs @@ -1202,11 +1202,11 @@ mod big_tests { #[unsafe_destructor] impl<'self> Drop for LVal<'self> { fn finalize(&self) { - let x = unsafe { task::local_data::local_data_get(self.key) }; + let x = unsafe { local_data::local_data_get(self.key) }; match x { Some(@y) => { unsafe { - task::local_data::local_data_set(self.key, @(y+1)); + local_data::local_data_set(self.key, @(y+1)); } } _ => fail!(~"Expected key to work"), |