user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

debugged a compiler ICE when merging local::borrow changes into the main io branch and modified the incoming new file lang.rs to be api-compatible

Browse source
This commit is contained in:
toddaaro 2013-06-10 15:29:02 -07:00
parent d4de99aa6c
commit d64d26cd39
10 changed files with 60 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

4
src/libstd/unstable/lang.rs
View file

@ -244,7 +244,7 @@ pub unsafe fn local_malloc(td: *c_char, size: uintptr_t) -> *c_char {
}
_ => {
let mut alloc = ::ptr::null();
do Local::borrow::<Task> |task| {
do Local::borrow::<Task,()> |task| {
alloc = task.heap.alloc(td as *c_void, size as uint) as *c_char;
}
return alloc;
@ -262,7 +262,7 @@ pub unsafe fn local_free(ptr: *c_char) {
rustrt::rust_upcall_free_noswitch(ptr);
}
_ => {
do Local::borrow::<Task> |task| {
do Local::borrow::<Task,()> |task| {
task.heap.free(ptr as *c_void);
}
}