From 11f7cb26c27c3eb3af3f7ef4f9cdb85327e6e030 Mon Sep 17 00:00:00 2001 From: Niko Matsakis Date: Tue, 7 May 2013 11:41:27 -0400 Subject: When autoborrowing a fn in trans, adjust the type of the datum to be `&fn`. Fixes #6141. --- src/rt/rust_task.cpp | 11 ++--------- 1 file changed, 2 insertions(+), 9 deletions(-) (limited to 'src/rt/rust_task.cpp') diff --git a/src/rt/rust_task.cpp b/src/rt/rust_task.cpp index 23e70535768..266c0652c6e 100644 --- a/src/rt/rust_task.cpp +++ b/src/rt/rust_task.cpp @@ -76,15 +76,8 @@ rust_task::delete_this() assert(ref_count == 0); // || // (ref_count == 1 && this == sched->root_task)); - if (borrow_list) { - // NOTE should free borrow_list from within rust code! - // If there is a pointer in there, it is a ~[BorrowRecord] pointer, - // which are currently allocated with LIBC malloc/free. But this is - // not really the right way to do this, we should be freeing this - // pointer from Rust code. - free(borrow_list); - borrow_list = NULL; - } + // The borrow list should be freed in the task annihilator + assert(!borrow_list); sched_loop->release_task(this); } -- cgit 1.4.1-3-g733a5