core: Rename unsafe::leak to unsafe::forget. Closes #2031

11 files changed, 20 insertions, 20 deletions

diff --git a/src/libcore/comm.rs b/src/libcore/comm.rs
index 78475c155b9..a4d1d2647ef 100644
--- a/src/libcore/comm.rs
+++ b/src/libcore/comm.rs
@@ -119,7 +119,7 @@ fn send<T: send>(ch: chan<T>, -data: T) {
     let res = rustrt::rust_port_id_send(sys::get_type_desc::<T>(), p, data);
     if res != 0u unsafe {
         // Data sent successfully
-        unsafe::leak(data);
+        unsafe::forget(data);
     }
     task::yield();
 }
diff --git a/src/libcore/option.rs b/src/libcore/option.rs
index 34577d7da7d..f2aebc12d33 100644
--- a/src/libcore/option.rs
+++ b/src/libcore/option.rs
@@ -83,7 +83,7 @@ fn unwrap<T>(-opt: option<T>) -> T unsafe {
       none { fail "option none" }
     };
     let liberated_value = unsafe::reinterpret_cast(*addr);
-    unsafe::leak(opt);
+    unsafe::forget(opt);
     ret liberated_value;
 }
 
diff --git a/src/libcore/run.rs b/src/libcore/run.rs
index 693832fca9d..d2af1eca3a2 100644
--- a/src/libcore/run.rs
+++ b/src/libcore/run.rs
@@ -129,7 +129,7 @@ fn with_envp<T>(env: option<[(str,str)]>,
             let t = #fmt("%s=%s", k, v);
             let mut v : [u8] = ::unsafe::reinterpret_cast(t);
             blk += v;
-            ::unsafe::leak(v);
+            ::unsafe::forget(v);
         }
         blk += [0_u8];
         vec::as_buf(blk) {|p| cb(::unsafe::reinterpret_cast(p)) }
diff --git a/src/libcore/str.rs b/src/libcore/str.rs
index b239579ba2d..ad3ed1f3cfc 100644
--- a/src/libcore/str.rs
+++ b/src/libcore/str.rs
@@ -129,7 +129,7 @@ fn from_byte(b: u8) -> str unsafe {
     assert b < 128u8;
     let mut v = [b, 0u8];
     let s: str = ::unsafe::reinterpret_cast(v);
-    ::unsafe::leak(v);
+    ::unsafe::forget(v);
     s
 }
 
@@ -273,7 +273,7 @@ The result vector is not null-terminated.
 fn bytes(s: str) -> [u8] unsafe {
     let mut s_copy = s;
     let mut v: [u8] = ::unsafe::reinterpret_cast(s_copy);
-    ::unsafe::leak(s_copy);
+    ::unsafe::forget(s_copy);
     vec::unsafe::set_len(v, len(s));
     ret v;
 }
@@ -1445,7 +1445,7 @@ let i = str::as_bytes(\"Hello World\") { |bytes| vec::len(bytes) };
 fn as_bytes<T>(s: str, f: fn([u8]) -> T) -> T unsafe {
     let mut v: [u8] = ::unsafe::reinterpret_cast(s);
     let r = f(v);
-    ::unsafe::leak(v);
+    ::unsafe::forget(v);
     r
 }
 
@@ -1517,7 +1517,7 @@ mod unsafe {
 
         assert is_utf8(v);
         let s: str = ::unsafe::reinterpret_cast(v);
-        ::unsafe::leak(v);
+        ::unsafe::forget(v);
         ret s;
     }
 
@@ -1541,7 +1541,7 @@ mod unsafe {
    unsafe fn from_bytes(v: [const u8]) -> str unsafe {
        let mut vcopy: [u8] = v + [0u8];
        let scopy: str = ::unsafe::reinterpret_cast(vcopy);
-       ::unsafe::leak(vcopy);
+       ::unsafe::forget(vcopy);
        ret scopy;
    }
 
@@ -1578,7 +1578,7 @@ mod unsafe {
        };
        v += [0u8];
        let s: str = ::unsafe::reinterpret_cast(v);
-       ::unsafe::leak(v);
+       ::unsafe::forget(v);
        ret s;
    }
 
diff --git a/src/libcore/task.rs b/src/libcore/task.rs
index e20b4cf8dc2..b7b26c5c4e1 100644
--- a/src/libcore/task.rs
+++ b/src/libcore/task.rs
@@ -504,7 +504,7 @@ fn spawn_raw(opts: task_opts, +f: fn~()) unsafe {
     }
 
     rustrt::start_task(new_task, closure);
-    unsafe::leak(f);
+    unsafe::forget(f);
 
     fn new_task_in_new_sched(opts: sched_opts) -> *rust_task {
         if opts.native_stack_size != none {
diff --git a/src/libcore/unsafe.rs b/src/libcore/unsafe.rs
index c7ba9ffe154..9a6375345d0 100644
--- a/src/libcore/unsafe.rs
+++ b/src/libcore/unsafe.rs
@@ -1,6 +1,6 @@
 #[doc = "Unsafe operations"];
 
-export reinterpret_cast, leak;
+export reinterpret_cast, forget;
 
 #[abi = "rust-intrinsic"]
 native mod rusti {
@@ -24,13 +24,13 @@ unsafe fn reinterpret_cast<T, U>(src: T) -> U {
 #[doc ="
 Move a thing into the void
 
-The leak function will take ownership of the provided value but neglect
+The forget function will take ownership of the provided value but neglect
 to run any required cleanup or memory-management operations on it. This
 can be used for various acts of magick, particularly when using
 reinterpret_cast on managed pointer types.
 "]
 #[inline(always)]
-unsafe fn leak<T>(-thing: T) { rusti::leak(thing); }
+unsafe fn forget<T>(-thing: T) { rusti::leak(thing); }
 
 #[cfg(test)]
 mod tests {
diff --git a/src/libcore/vec.rs b/src/libcore/vec.rs
index 737c9233733..e726c933532 100644
--- a/src/libcore/vec.rs
+++ b/src/libcore/vec.rs
@@ -155,14 +155,14 @@ fn from_elem<T: copy>(n_elts: uint, t: T) -> [T] {
 #[doc = "Produces a mutable vector from an immutable vector."]
 fn to_mut<T>(+v: [T]) -> [mutable T] unsafe {
     let r = ::unsafe::reinterpret_cast(v);
-    ::unsafe::leak(v);
+    ::unsafe::forget(v);
     r
 }
 
 #[doc = "Produces an immutable vector from a mutable vector."]
 fn from_mut<T>(+v: [mutable T]) -> [T] unsafe {
     let r = ::unsafe::reinterpret_cast(v);
-    ::unsafe::leak(v);
+    ::unsafe::forget(v);
     r
 }
 
diff --git a/src/libstd/rope.rs b/src/libstd/rope.rs
index eadd4b3e0dd..982bfe36b03 100644
--- a/src/libstd/rope.rs
+++ b/src/libstd/rope.rs
@@ -813,12 +813,12 @@ mod node {
                     offset += 1u;
                     i      += 1u;
                 }
-                unsafe::leak(local_buf);
+                unsafe::forget(local_buf);
               }
             }
         }
         let str : str = unsafe::reinterpret_cast(buf);
-        unsafe::leak(buf);//TODO: Check if this is correct
+        unsafe::forget(buf);//TODO: Check if this is correct
         ret str;
     }
 
diff --git a/src/rustc/middle/trans/debuginfo.rs b/src/rustc/middle/trans/debuginfo.rs
index 38ca61230e3..98b5224f9ff 100644
--- a/src/rustc/middle/trans/debuginfo.rs
+++ b/src/rustc/middle/trans/debuginfo.rs
@@ -123,7 +123,7 @@ enum debug_metadata {
 fn cast_safely<T: copy, U>(val: T) -> U unsafe {
     let val2 = val;
     let val3 = unsafe::reinterpret_cast(val2);
-    unsafe::leak(val2);
+    unsafe::forget(val2);
     ret val3;
 }
 
diff --git a/src/rustc/middle/ty.rs b/src/rustc/middle/ty.rs
index 59cd0ffe13c..fd9765e3fc3 100644
--- a/src/rustc/middle/ty.rs
+++ b/src/rustc/middle/ty.rs
@@ -220,7 +220,7 @@ type t = *t_opaque;
 pure fn get(t: t) -> t_box unsafe {
     let t2 = unsafe::reinterpret_cast::<t, t_box>(t);
     let t3 = t2;
-    unsafe::leak(t2);
+    unsafe::forget(t2);
     t3
 }
 
diff --git a/src/test/run-pass/rt-sched-1.rs b/src/test/run-pass/rt-sched-1.rs
index 94acb543e81..447380663f4 100644
--- a/src/test/run-pass/rt-sched-1.rs
+++ b/src/test/run-pass/rt-sched-1.rs
@@ -31,6 +31,6 @@ fn main() unsafe {
     };
     let fptr = unsafe::reinterpret_cast(ptr::addr_of(f));
     rustrt::start_task(new_task_id, fptr);
-    unsafe::leak(f);
+    unsafe::forget(f);
     comm::recv(po);
 }
\ No newline at end of file