diff options
| author | Brian Anderson <banderson@mozilla.com> | 2012-09-18 11:18:56 -0700 |
|---|---|---|
| committer | Brian Anderson <banderson@mozilla.com> | 2012-09-18 11:19:17 -0700 |
| commit | 5c18bf6cdd581108cb924f23ef5a23d9c17352e2 (patch) | |
| tree | d47ece80002f32067bcf447ba902ab6c6fc719b8 /src | |
| parent | ae86db0d93f98ae2dbe0e11a14cadd8ad6bd4620 (diff) | |
core: Rename at_vec::unsafe to raw
Diffstat (limited to 'src')
| -rw-r--r-- | src/libcore/at_vec.rs | 8 | ||||
| -rw-r--r-- | src/libstd/arena.rs | 2 |
2 files changed, 5 insertions, 5 deletions
diff --git a/src/libcore/at_vec.rs b/src/libcore/at_vec.rs index 845437ac959..c05f0c3fc44 100644 --- a/src/libcore/at_vec.rs +++ b/src/libcore/at_vec.rs @@ -28,7 +28,7 @@ extern mod rusti { #[inline(always)] pure fn capacity<T>(&&v: @[const T]) -> uint { unsafe { - let repr: **unsafe::VecRepr = + let repr: **raw::VecRepr = ::unsafe::reinterpret_cast(&addr_of(v)); (**repr).unboxed.alloc / sys::size_of::<T>() } @@ -49,8 +49,8 @@ pure fn capacity<T>(&&v: @[const T]) -> uint { #[inline(always)] pure fn build_sized<A>(size: uint, builder: fn(push: pure fn(+A))) -> @[A] { let mut vec = @[]; - unsafe { unsafe::reserve(vec, size); } - builder(|+x| unsafe { unsafe::push(vec, move x) }); + unsafe { raw::reserve(vec, size); } + builder(|+x| unsafe { raw::push(vec, move x) }); return vec; } @@ -141,7 +141,7 @@ impl<T: Copy> @[T]: Add<&[const T],@[T]> { } -mod unsafe { +mod raw { type VecRepr = vec::raw::VecRepr; type SliceRepr = vec::raw::SliceRepr; diff --git a/src/libstd/arena.rs b/src/libstd/arena.rs index 637c7451de0..73a3b2c7511 100644 --- a/src/libstd/arena.rs +++ b/src/libstd/arena.rs @@ -66,7 +66,7 @@ struct Arena { fn chunk(size: uint, is_pod: bool) -> Chunk { let mut v = @[]; - unsafe { at_vec::unsafe::reserve(v, size); } + unsafe { at_vec::raw::reserve(v, size); } { data: v, mut fill: 0u, is_pod: is_pod } } |
