Skip to content

Commit 413f93e

Browse files
committed
---
yaml --- r: 33277 b: refs/heads/snap-stage3 c: 945d57a h: refs/heads/master i: 33275: 76e14d3 v: v3
1 parent 17d3818 commit 413f93e

File tree

4 files changed

+12
-11
lines changed

4 files changed

+12
-11
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: 3c1ff31f4a70b6bd7840cf75af9395aedfac060b
4+
refs/heads/snap-stage3: 945d57a6ff8d31337bf6cdedcfa6c4a03d9f1ddc
55
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libcore/reflect.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -246,7 +246,7 @@ impl<V: TyVisitor MovePtr> MovePtrAdaptor<V>: TyVisitor {
246246
}
247247

248248
fn visit_unboxed_vec(mtbl: uint, inner: *TyDesc) -> bool {
249-
self.align_to::<vec::raw::UnboxedVecRepr>();
249+
self.align_to::<vec::UnboxedVecRepr>();
250250
if ! self.inner.visit_vec(mtbl, inner) { return false; }
251251
true
252252
}

branches/snap-stage3/src/libcore/repr.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,8 @@ use to_str::ToStr;
1515
use cast::transmute;
1616
use intrinsic::{TyDesc, TyVisitor, visit_tydesc};
1717
use reflect::{MovePtr, MovePtrAdaptor};
18-
use vec::raw::{VecRepr, UnboxedVecRepr, SliceRepr};
18+
use vec::UnboxedVecRepr;
19+
use vec::raw::{VecRepr, SliceRepr};
1920
pub use box::raw::BoxRepr;
2021
use box::raw::BoxHeaderRepr;
2122

@@ -303,7 +304,7 @@ impl ReprVisitor : TyVisitor {
303304

304305

305306
fn visit_unboxed_vec(mtbl: uint, inner: *TyDesc) -> bool {
306-
do self.get::<vec::raw::UnboxedVecRepr> |b| {
307+
do self.get::<vec::UnboxedVecRepr> |b| {
307308
self.write_unboxed_vec_repr(mtbl, b, inner);
308309
}
309310
}

branches/snap-stage3/src/libcore/vec.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -1671,6 +1671,13 @@ pub unsafe fn from_buf<T>(ptr: *T, elts: uint) -> ~[T] {
16711671
raw::from_buf_raw(ptr, elts)
16721672
}
16731673

1674+
/// The internal 'unboxed' representation of a vector
1675+
pub struct UnboxedVecRepr {
1676+
mut fill: uint,
1677+
mut alloc: uint,
1678+
data: u8
1679+
}
1680+
16741681
/// Unsafe operations
16751682
mod raw {
16761683

@@ -1680,13 +1687,6 @@ mod raw {
16801687
unboxed: UnboxedVecRepr
16811688
}
16821689

1683-
/// The internal 'unboxed' representation of a vector
1684-
pub struct UnboxedVecRepr {
1685-
mut fill: uint,
1686-
mut alloc: uint,
1687-
data: u8
1688-
}
1689-
16901690
pub type SliceRepr = {
16911691
mut data: *u8,
16921692
mut len: uint

0 commit comments

Comments
 (0)