Skip to content

Commit b181ea4

Browse files
committed
core: Rename unsafe::leak to unsafe::forget. Closes #2031
1 parent 56828d4 commit b181ea4

File tree

11 files changed

+20
-20
lines changed

11 files changed

+20
-20
lines changed

src/libcore/comm.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -119,7 +119,7 @@ fn send<T: send>(ch: chan<T>, -data: T) {
119119
let res = rustrt::rust_port_id_send(sys::get_type_desc::<T>(), p, data);
120120
if res != 0u unsafe {
121121
// Data sent successfully
122-
unsafe::leak(data);
122+
unsafe::forget(data);
123123
}
124124
task::yield();
125125
}

src/libcore/option.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,7 @@ fn unwrap<T>(-opt: option<T>) -> T unsafe {
8383
none { fail "option none" }
8484
};
8585
let liberated_value = unsafe::reinterpret_cast(*addr);
86-
unsafe::leak(opt);
86+
unsafe::forget(opt);
8787
ret liberated_value;
8888
}
8989

src/libcore/run.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fn with_envp<T>(env: option<[(str,str)]>,
129129
let t = #fmt("%s=%s", k, v);
130130
let mut v : [u8] = ::unsafe::reinterpret_cast(t);
131131
blk += v;
132-
::unsafe::leak(v);
132+
::unsafe::forget(v);
133133
}
134134
blk += [0_u8];
135135
vec::as_buf(blk) {|p| cb(::unsafe::reinterpret_cast(p)) }

src/libcore/str.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -129,7 +129,7 @@ fn from_byte(b: u8) -> str unsafe {
129129
assert b < 128u8;
130130
let mut v = [b, 0u8];
131131
let s: str = ::unsafe::reinterpret_cast(v);
132-
::unsafe::leak(v);
132+
::unsafe::forget(v);
133133
s
134134
}
135135

@@ -273,7 +273,7 @@ The result vector is not null-terminated.
273273
fn bytes(s: str) -> [u8] unsafe {
274274
let mut s_copy = s;
275275
let mut v: [u8] = ::unsafe::reinterpret_cast(s_copy);
276-
::unsafe::leak(s_copy);
276+
::unsafe::forget(s_copy);
277277
vec::unsafe::set_len(v, len(s));
278278
ret v;
279279
}
@@ -1445,7 +1445,7 @@ let i = str::as_bytes(\"Hello World\") { |bytes| vec::len(bytes) };
14451445
fn as_bytes<T>(s: str, f: fn([u8]) -> T) -> T unsafe {
14461446
let mut v: [u8] = ::unsafe::reinterpret_cast(s);
14471447
let r = f(v);
1448-
::unsafe::leak(v);
1448+
::unsafe::forget(v);
14491449
r
14501450
}
14511451

@@ -1517,7 +1517,7 @@ mod unsafe {
15171517

15181518
assert is_utf8(v);
15191519
let s: str = ::unsafe::reinterpret_cast(v);
1520-
::unsafe::leak(v);
1520+
::unsafe::forget(v);
15211521
ret s;
15221522
}
15231523

@@ -1541,7 +1541,7 @@ mod unsafe {
15411541
unsafe fn from_bytes(v: [const u8]) -> str unsafe {
15421542
let mut vcopy: [u8] = v + [0u8];
15431543
let scopy: str = ::unsafe::reinterpret_cast(vcopy);
1544-
::unsafe::leak(vcopy);
1544+
::unsafe::forget(vcopy);
15451545
ret scopy;
15461546
}
15471547

@@ -1578,7 +1578,7 @@ mod unsafe {
15781578
};
15791579
v += [0u8];
15801580
let s: str = ::unsafe::reinterpret_cast(v);
1581-
::unsafe::leak(v);
1581+
::unsafe::forget(v);
15821582
ret s;
15831583
}
15841584

src/libcore/task.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ fn spawn_raw(opts: task_opts, +f: fn~()) unsafe {
504504
}
505505

506506
rustrt::start_task(new_task, closure);
507-
unsafe::leak(f);
507+
unsafe::forget(f);
508508

509509
fn new_task_in_new_sched(opts: sched_opts) -> *rust_task {
510510
if opts.native_stack_size != none {

src/libcore/unsafe.rs

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
#[doc = "Unsafe operations"];
22

3-
export reinterpret_cast, leak;
3+
export reinterpret_cast, forget;
44

55
#[abi = "rust-intrinsic"]
66
native mod rusti {
@@ -24,13 +24,13 @@ unsafe fn reinterpret_cast<T, U>(src: T) -> U {
2424
#[doc ="
2525
Move a thing into the void
2626
27-
The leak function will take ownership of the provided value but neglect
27+
The forget function will take ownership of the provided value but neglect
2828
to run any required cleanup or memory-management operations on it. This
2929
can be used for various acts of magick, particularly when using
3030
reinterpret_cast on managed pointer types.
3131
"]
3232
#[inline(always)]
33-
unsafe fn leak<T>(-thing: T) { rusti::leak(thing); }
33+
unsafe fn forget<T>(-thing: T) { rusti::leak(thing); }
3434

3535
#[cfg(test)]
3636
mod tests {

src/libcore/vec.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -155,14 +155,14 @@ fn from_elem<T: copy>(n_elts: uint, t: T) -> [T] {
155155
#[doc = "Produces a mutable vector from an immutable vector."]
156156
fn to_mut<T>(+v: [T]) -> [mutable T] unsafe {
157157
let r = ::unsafe::reinterpret_cast(v);
158-
::unsafe::leak(v);
158+
::unsafe::forget(v);
159159
r
160160
}
161161

162162
#[doc = "Produces an immutable vector from a mutable vector."]
163163
fn from_mut<T>(+v: [mutable T]) -> [T] unsafe {
164164
let r = ::unsafe::reinterpret_cast(v);
165-
::unsafe::leak(v);
165+
::unsafe::forget(v);
166166
r
167167
}
168168

src/libstd/rope.rs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -813,12 +813,12 @@ mod node {
813813
offset += 1u;
814814
i += 1u;
815815
}
816-
unsafe::leak(local_buf);
816+
unsafe::forget(local_buf);
817817
}
818818
}
819819
}
820820
let str : str = unsafe::reinterpret_cast(buf);
821-
unsafe::leak(buf);//TODO: Check if this is correct
821+
unsafe::forget(buf);//TODO: Check if this is correct
822822
ret str;
823823
}
824824

src/rustc/middle/trans/debuginfo.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ enum debug_metadata {
123123
fn cast_safely<T: copy, U>(val: T) -> U unsafe {
124124
let val2 = val;
125125
let val3 = unsafe::reinterpret_cast(val2);
126-
unsafe::leak(val2);
126+
unsafe::forget(val2);
127127
ret val3;
128128
}
129129

src/rustc/middle/ty.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,7 @@ type t = *t_opaque;
220220
pure fn get(t: t) -> t_box unsafe {
221221
let t2 = unsafe::reinterpret_cast::<t, t_box>(t);
222222
let t3 = t2;
223-
unsafe::leak(t2);
223+
unsafe::forget(t2);
224224
t3
225225
}
226226

src/test/run-pass/rt-sched-1.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,6 @@ fn main() unsafe {
3131
};
3232
let fptr = unsafe::reinterpret_cast(ptr::addr_of(f));
3333
rustrt::start_task(new_task_id, fptr);
34-
unsafe::leak(f);
34+
unsafe::forget(f);
3535
comm::recv(po);
3636
}

0 commit comments

Comments
 (0)