diff options
| author | bors <bors@rust-lang.org> | 2014-04-06 05:46:38 -0700 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2014-04-06 05:46:38 -0700 |
| commit | 4af69f204e2365da0dc9f32bbd0eb3201dc9a9e0 (patch) | |
| tree | 203192e4ad78551953590942bb0df3b45c37d27a /src/libstd | |
| parent | f1f50565a1fda0dfd60d89fea65e2328f42cc5e0 (diff) | |
| parent | 2d22243b0c582574394da7e3d8aaf8b2abf2c147 (diff) | |
| download | rust-4af69f204e2365da0dc9f32bbd0eb3201dc9a9e0.tar.gz rust-4af69f204e2365da0dc9f32bbd0eb3201dc9a9e0.zip | |
auto merge of #13344 : eddyb/rust/kill-unboxed-vec, r=cmr
Removes the special `ty_unboxed_vec` type from the type system. It was previously used only during translating `~[T]`/`~str` allocation and drop glue.
Diffstat (limited to 'src/libstd')
| -rw-r--r-- | src/libstd/intrinsics.rs | 2 | ||||
| -rw-r--r-- | src/libstd/reflect.rs | 14 | ||||
| -rw-r--r-- | src/libstd/repr.rs | 9 |
3 files changed, 0 insertions, 25 deletions
diff --git a/src/libstd/intrinsics.rs b/src/libstd/intrinsics.rs index 6fe6b3c3639..896ebcd6fb5 100644 --- a/src/libstd/intrinsics.rs +++ b/src/libstd/intrinsics.rs @@ -108,8 +108,6 @@ pub trait TyVisitor { fn visit_ptr(&mut self, mtbl: uint, inner: *TyDesc) -> bool; fn visit_rptr(&mut self, mtbl: uint, inner: *TyDesc) -> bool; - fn visit_vec(&mut self, mtbl: uint, inner: *TyDesc) -> bool; - fn visit_unboxed_vec(&mut self, mtbl: uint, inner: *TyDesc) -> bool; fn visit_evec_box(&mut self, mtbl: uint, inner: *TyDesc) -> bool; fn visit_evec_uniq(&mut self, mtbl: uint, inner: *TyDesc) -> bool; fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool; diff --git a/src/libstd/reflect.rs b/src/libstd/reflect.rs index 997b65c2e1f..e64a6b86d02 100644 --- a/src/libstd/reflect.rs +++ b/src/libstd/reflect.rs @@ -18,7 +18,6 @@ Runtime type reflection use intrinsics::{Disr, Opaque, TyDesc, TyVisitor}; use mem; -use raw; /** * Trait for visitor that wishes to reflect on data. To use this, create a @@ -239,19 +238,6 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> { true } - fn visit_unboxed_vec(&mut self, mtbl: uint, inner: *TyDesc) -> bool { - self.align_to::<raw::Vec<()>>(); - if ! self.inner.visit_vec(mtbl, inner) { return false; } - true - } - - fn visit_vec(&mut self, mtbl: uint, inner: *TyDesc) -> bool { - self.align_to::<~[u8]>(); - if ! self.inner.visit_vec(mtbl, inner) { return false; } - self.bump_past::<~[u8]>(); - true - } - fn visit_evec_box(&mut self, _mtbl: uint, _inner: *TyDesc) -> bool { true } diff --git a/src/libstd/repr.rs b/src/libstd/repr.rs index 9d1d406e803..a1fa7cb225f 100644 --- a/src/libstd/repr.rs +++ b/src/libstd/repr.rs @@ -341,15 +341,6 @@ impl<'a> TyVisitor for ReprVisitor<'a> { }) } - // Type no longer exists, vestigial function. - fn visit_vec(&mut self, _mtbl: uint, _inner: *TyDesc) -> bool { fail!(); } - - fn visit_unboxed_vec(&mut self, mtbl: uint, inner: *TyDesc) -> bool { - self.get::<raw::Vec<()>>(|this, b| { - this.write_unboxed_vec_repr(mtbl, b, inner) - }) - } - fn visit_evec_box(&mut self, mtbl: uint, inner: *TyDesc) -> bool { self.get::<&raw::Box<raw::Vec<()>>>(|this, b| { try!(this, this.writer.write(['@' as u8])); |
