rust-lang/rust
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

auto merge of #6329 : sonwow/rust/issue-6306, r=ILyoan

Browse Source 
Fix for #6306
This commit is contained in:
bors
2013-05-10 03:04:51 -07:00
parent e9d0018abf 4400bbd72a
commit 6da2c989ba
16 changed files with 24 additions and 23 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/libstd/rl.rs
View File

@@ -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| {

4
src/libstd/sort.rs
View File

@@ -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"),

4
src/libstd/sort_stage0.rs
View File

@@ -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"),