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

Tidy fixes

Browse Source
This commit is contained in:
Brian Anderson
2012-06-27 22:03:12 -07:00
parent 1ff6f9b876
commit 6f57c61ed0
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/libcore/task.rs
View File

@@ -710,7 +710,7 @@ unsafe fn local_set<T>(task: *rust_task, key: local_data_key<T>, -data: @T) {
// Key already had a value set, old_data_ptr, whose reference we // Key already had a value set, old_data_ptr, whose reference we
// need to drop. After that, overwriting its slot will be safe. // need to drop. After that, overwriting its slot will be safe.
// (The heap-allocated finaliser will be freed in the overwrite.) // (The heap-allocated finaliser will be freed in the overwrite.)
// FIXME(2734): just transmuting old_data_ptr to @T doesn't work, // FIXME(#2734): just transmuting old_data_ptr to @T doesn't work,
// similarly to the sample there (but more our/unsafety's fault?). // similarly to the sample there (but more our/unsafety's fault?).
old_finaliser(old_data_ptr); old_finaliser(old_data_ptr);
(*map).set_elt(index, new_entry); (*map).set_elt(index, new_entry);

4
src/rt/rust_task.h
View File

@@ -379,8 +379,8 @@ rust_task::call_on_c_stack(void *args, void *fn_ptr) {
// Too expensive to check // Too expensive to check
// assert(on_rust_stack()); // assert(on_rust_stack());
// The shim functions generated by rustc contain the morestack prologue, so // The shim functions generated by rustc contain the morestack prologue,
// we need to let them know they have enough stack. // so we need to let them know they have enough stack.
record_sp_limit(0); record_sp_limit(0);
uintptr_t prev_rust_sp = next_rust_sp; uintptr_t prev_rust_sp = next_rust_sp;