Skip to content

Commit 8bf02bd

Browse files
committed
---
yaml --- r: 23981 b: refs/heads/master c: 5c18bf6 h: refs/heads/master i: 23979: 02ef6ca v: v3
1 parent 7b83823 commit 8bf02bd

File tree

3 files changed

+6
-6
lines changed

3 files changed

+6
-6
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
---
2-
refs/heads/master: ae86db0d93f98ae2dbe0e11a14cadd8ad6bd4620
2+
refs/heads/master: 5c18bf6cdd581108cb924f23ef5a23d9c17352e2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
44
refs/heads/snap-stage3: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
55
refs/heads/try: ffbe0e0e00374358b789b0037bcb3a577cd218be

trunk/src/libcore/at_vec.rs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ extern mod rusti {
2828
#[inline(always)]
2929
pure fn capacity<T>(&&v: @[const T]) -> uint {
3030
unsafe {
31-
let repr: **unsafe::VecRepr =
31+
let repr: **raw::VecRepr =
3232
::unsafe::reinterpret_cast(&addr_of(v));
3333
(**repr).unboxed.alloc / sys::size_of::<T>()
3434
}
@@ -49,8 +49,8 @@ pure fn capacity<T>(&&v: @[const T]) -> uint {
4949
#[inline(always)]
5050
pure fn build_sized<A>(size: uint, builder: fn(push: pure fn(+A))) -> @[A] {
5151
let mut vec = @[];
52-
unsafe { unsafe::reserve(vec, size); }
53-
builder(|+x| unsafe { unsafe::push(vec, move x) });
52+
unsafe { raw::reserve(vec, size); }
53+
builder(|+x| unsafe { raw::push(vec, move x) });
5454
return vec;
5555
}
5656

@@ -141,7 +141,7 @@ impl<T: Copy> @[T]: Add<&[const T],@[T]> {
141141
}
142142

143143

144-
mod unsafe {
144+
mod raw {
145145
type VecRepr = vec::raw::VecRepr;
146146
type SliceRepr = vec::raw::SliceRepr;
147147

trunk/src/libstd/arena.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ struct Arena {
6666

6767
fn chunk(size: uint, is_pod: bool) -> Chunk {
6868
let mut v = @[];
69-
unsafe { at_vec::unsafe::reserve(v, size); }
69+
unsafe { at_vec::raw::reserve(v, size); }
7070
{ data: v, mut fill: 0u, is_pod: is_pod }
7171
}
7272

0 commit comments

Comments
 (0)