diff options
| author | Alex Crichton <alex@alexcrichton.com> | 2014-06-06 10:27:49 -0700 |
|---|---|---|
| committer | Alex Crichton <alex@alexcrichton.com> | 2014-06-11 15:02:17 -0700 |
| commit | 3316b1eb7c3eb520896af489dd45c4d17190d0a8 (patch) | |
| tree | c94cde854a882cad33d8ec7fe0067b43b5cb96d7 /src/libdebug | |
| parent | f9260d41d6e37653bf71b08a041be0310098716a (diff) | |
| download | rust-3316b1eb7c3eb520896af489dd45c4d17190d0a8.tar.gz rust-3316b1eb7c3eb520896af489dd45c4d17190d0a8.zip | |
rustc: Remove ~[T] from the language
The following features have been removed * box [a, b, c] * ~[a, b, c] * box [a, ..N] * ~[a, ..N] * ~[T] (as a type) * deprecated_owned_vector lint All users of ~[T] should move to using Vec<T> instead.
Diffstat (limited to 'src/libdebug')
| -rw-r--r-- | src/libdebug/reflect.rs | 16 | ||||
| -rw-r--r-- | src/libdebug/repr.rs | 30 |
2 files changed, 17 insertions, 29 deletions
diff --git a/src/libdebug/reflect.rs b/src/libdebug/reflect.rs index 997d3427122..3a12aec39a1 100644 --- a/src/libdebug/reflect.rs +++ b/src/libdebug/reflect.rs @@ -192,15 +192,14 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> { true } + #[cfg(stage0)] fn visit_estr_box(&mut self) -> bool { true } + #[cfg(stage0)] fn visit_estr_uniq(&mut self) -> bool { - self.align_to::<~str>(); - if ! self.inner.visit_estr_uniq() { return false; } - self.bump_past::<~str>(); - true + false } fn visit_estr_slice(&mut self) -> bool { @@ -247,15 +246,14 @@ impl<V:TyVisitor + MovePtr> TyVisitor for MovePtrAdaptor<V> { true } + #[cfg(stage0)] fn visit_evec_box(&mut self, _mtbl: uint, _inner: *TyDesc) -> bool { true } - fn visit_evec_uniq(&mut self, mtbl: uint, inner: *TyDesc) -> bool { - self.align_to::<~[u8]>(); - if ! self.inner.visit_evec_uniq(mtbl, inner) { return false; } - self.bump_past::<~[u8]>(); - true + #[cfg(stage0)] + fn visit_evec_uniq(&mut self, _mtbl: uint, _inner: *TyDesc) -> bool { + false } fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool { diff --git a/src/libdebug/repr.rs b/src/libdebug/repr.rs index e6cc9785b44..86b71eb5b8d 100644 --- a/src/libdebug/repr.rs +++ b/src/libdebug/repr.rs @@ -203,10 +203,6 @@ impl<'a> ReprVisitor<'a> { true } - pub fn write_unboxed_vec_repr(&mut self, _: uint, v: &raw::Vec<()>, inner: *TyDesc) -> bool { - self.write_vec_range(&v.data, v.fill, inner) - } - fn write_escaped_char(&mut self, ch: char, is_str: bool) -> bool { try!(self, match ch { '\t' => self.writer.write("\\t".as_bytes()), @@ -271,15 +267,14 @@ impl<'a> TyVisitor for ReprVisitor<'a> { }) } + #[cfg(stage0)] fn visit_estr_box(&mut self) -> bool { - true + false } + #[cfg(stage0)] fn visit_estr_uniq(&mut self) -> bool { - self.get::<~str>(|this, s| { - try!(this, this.writer.write(['~' as u8])); - this.write_escaped_slice(*s) - }) + false } fn visit_estr_slice(&mut self) -> bool { @@ -323,19 +318,14 @@ impl<'a> TyVisitor for ReprVisitor<'a> { }) } - 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])); - this.write_mut_qualifier(mtbl); - this.write_unboxed_vec_repr(mtbl, &b.data, inner) - }) + #[cfg(stage0)] + fn visit_evec_box(&mut self, _mtbl: uint, _inner: *TyDesc) -> bool { + true } - fn visit_evec_uniq(&mut self, mtbl: uint, inner: *TyDesc) -> bool { - self.get::<&raw::Vec<()>>(|this, b| { - try!(this, this.writer.write("box ".as_bytes())); - this.write_unboxed_vec_repr(mtbl, *b, inner) - }) + #[cfg(stage0)] + fn visit_evec_uniq(&mut self, _mtbl: uint, _inner: *TyDesc) -> bool { + true } fn visit_evec_slice(&mut self, mtbl: uint, inner: *TyDesc) -> bool { |
