Skip to content

Remove hacks around issues in local_data #9073

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

Remove hacks around issues in local_data #9073

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 7 additions & 9 deletions src/libstd/local_data.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -155,13 +155,13 @@ pub fn pop<T: 'static>(key: Key<T>) -> Option<T> {

// Move `data` into transmute to get out the memory that it
// owns, we must free it manually later.
let (_vtable, box): (uint, ~~T) = unsafe {
let (_vtable, box): (uint, ~T) = unsafe {
cast::transmute(data)
};

// Now that we own `box`, we can just move out of it as we would
// with any other data.
return Some(**box);
return Some(*box);
}
_ => {}
}
Expand Down Expand Up @@ -244,13 +244,13 @@ fn get_with<T: 'static, U>(key: Key<T>,
want.describe(), cur.describe());
}
}
// data was created with `~~T as ~LocalData`, so we extract
// pointer part of the trait, (as ~~T), and then use
// data was created with `~T as ~LocalData`, so we extract
// pointer part of the trait, (as ~T), and then use
// compiler coercions to achieve a '&' pointer.
unsafe {
match *cast::transmute::<&TLSValue, &(uint, ~~T)>(data){
match *cast::transmute::<&TLSValue, &(uint, ~T)>(data){
(_vtable, ref box) => {
let value: &T = **box;
let value: &T = *box;
ret = f(Some(value));
}
}
Expand Down Expand Up @@ -294,9 +294,7 @@ pub fn set<T: 'static>(key: Key<T>, data: T) {
// everything to a trait (LocalData) which is then stored inside the map.
// Upon destruction of the map, all the objects will be destroyed and the
// traits have enough information about them to destroy themselves.
//
// FIXME(#7673): This should be "~data as ~LocalData" (only one sigil)
let data = ~~data as ~LocalData:;
let data = ~data as ~LocalData:;

fn insertion_position(map: &mut Map,
key: *libc::c_void) -> Option<uint> {
Expand Down