diff options
| author | Patrick Walton <pcwalton@mimiga.net> | 2014-05-05 18:56:44 -0700 |
|---|---|---|
| committer | Patrick Walton <pcwalton@mimiga.net> | 2014-05-06 23:12:54 -0700 |
| commit | 090040bf4037a094e50b03d79e4baf5cd89c912b (patch) | |
| tree | 27fa91d623889d59260d3db167abdfa8c4288849 /src/libstd/slice.rs | |
| parent | 24f6f26e633e50b5b59f9d0f6cca0b1e49e215d9 (diff) | |
| download | rust-090040bf4037a094e50b03d79e4baf5cd89c912b.tar.gz rust-090040bf4037a094e50b03d79e4baf5cd89c912b.zip | |
librustc: Remove `~EXPR`, `~TYPE`, and `~PAT` from the language, except
for `~str`/`~[]`. Note that `~self` still remains, since I forgot to add support for `Box<self>` before the snapshot. How to update your code: * Instead of `~EXPR`, you should write `box EXPR`. * Instead of `~TYPE`, you should write `Box<Type>`. * Instead of `~PATTERN`, you should write `box PATTERN`. [breaking-change]
Diffstat (limited to 'src/libstd/slice.rs')
| -rw-r--r-- | src/libstd/slice.rs | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/src/libstd/slice.rs b/src/libstd/slice.rs index d8c866ef44a..2ea6dc1afe6 100644 --- a/src/libstd/slice.rs +++ b/src/libstd/slice.rs @@ -2352,10 +2352,11 @@ impl<A> FromIterator<A> for ~[A] { #[cfg(test)] mod tests { use prelude::*; - use mem; - use slice::*; use cmp::*; + use mem; + use owned::Box; use rand::{Rng, task_rng}; + use slice::*; fn square(n: uint) -> uint { n * n } @@ -2738,8 +2739,8 @@ mod tests { let mut v2 = vec![box 1, box 2, box 3, box 3]; v2.dedup(); /* - * If the ~pointers were leaked or otherwise misused, valgrind and/or - * rustrt should raise errors. + * If the boxed pointers were leaked or otherwise misused, valgrind + * and/or rustrt should raise errors. */ } @@ -3117,7 +3118,7 @@ mod tests { struct S { f: Cell<int>, - boxes: (~int, Rc<int>) + boxes: (Box<int>, Rc<int>) } impl Clone for S { @@ -3566,13 +3567,7 @@ mod tests { } assert_eq!(cnt, 11); - let xs = vec![Foo, Foo, Foo]; - assert_eq!(format!("{:?}", xs.slice(0, 2).to_owned()), - "~[slice::tests::Foo, slice::tests::Foo]".to_owned()); - let xs: [Foo, ..3] = [Foo, Foo, Foo]; - assert_eq!(format!("{:?}", xs.slice(0, 2).to_owned()), - "~[slice::tests::Foo, slice::tests::Foo]".to_owned()); cnt = 0; for f in xs.iter() { assert!(*f == Foo); |
