File tree Expand file tree Collapse file tree 4 files changed +12
-11
lines changed
branches/snap-stage3/src/libcore Expand file tree Collapse file tree 4 files changed +12
-11
lines changed Original file line number Diff line number Diff line change 1
1
---
2
2
refs/heads/master: cd6f24f9d14ac90d167386a56e7a6ac1f0318195
3
3
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4
- refs/heads/snap-stage3: 3c1ff31f4a70b6bd7840cf75af9395aedfac060b
4
+ refs/heads/snap-stage3: 945d57a6ff8d31337bf6cdedcfa6c4a03d9f1ddc
5
5
refs/heads/try: d324a424d8f84b1eb049b12cf34182bda91b0024
6
6
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
7
7
refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
Original file line number Diff line number Diff line change @@ -246,7 +246,7 @@ impl<V: TyVisitor MovePtr> MovePtrAdaptor<V>: TyVisitor {
246
246
}
247
247
248
248
fn visit_unboxed_vec ( mtbl : uint , inner : * TyDesc ) -> bool {
249
- self . align_to :: < vec:: raw :: UnboxedVecRepr > ( ) ;
249
+ self . align_to :: < vec:: UnboxedVecRepr > ( ) ;
250
250
if ! self . inner . visit_vec ( mtbl, inner) { return false ; }
251
251
true
252
252
}
Original file line number Diff line number Diff line change @@ -15,7 +15,8 @@ use to_str::ToStr;
15
15
use cast:: transmute;
16
16
use intrinsic:: { TyDesc , TyVisitor , visit_tydesc} ;
17
17
use reflect:: { MovePtr , MovePtrAdaptor } ;
18
- use vec:: raw:: { VecRepr , UnboxedVecRepr , SliceRepr } ;
18
+ use vec:: UnboxedVecRepr ;
19
+ use vec:: raw:: { VecRepr , SliceRepr } ;
19
20
pub use box:: raw:: BoxRepr ;
20
21
use box:: raw:: BoxHeaderRepr ;
21
22
@@ -303,7 +304,7 @@ impl ReprVisitor : TyVisitor {
303
304
304
305
305
306
fn visit_unboxed_vec ( mtbl : uint , inner : * TyDesc ) -> bool {
306
- do self . get :: < vec:: raw :: UnboxedVecRepr > |b| {
307
+ do self . get :: < vec:: UnboxedVecRepr > |b| {
307
308
self . write_unboxed_vec_repr ( mtbl, b, inner) ;
308
309
}
309
310
}
Original file line number Diff line number Diff line change @@ -1671,6 +1671,13 @@ pub unsafe fn from_buf<T>(ptr: *T, elts: uint) -> ~[T] {
1671
1671
raw:: from_buf_raw ( ptr, elts)
1672
1672
}
1673
1673
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
+
1674
1681
/// Unsafe operations
1675
1682
mod raw {
1676
1683
@@ -1680,13 +1687,6 @@ mod raw {
1680
1687
unboxed : UnboxedVecRepr
1681
1688
}
1682
1689
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
-
1690
1690
pub type SliceRepr = {
1691
1691
mut data : * u8,
1692
1692
mut len : uint
You can’t perform that action at this time.
0 commit comments