diff options
| author | bors <bors@rust-lang.org> | 2015-01-29 16:28:52 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2015-01-29 16:28:52 +0000 |
| commit | 265a23320dbeaeca45b889cfea684d71dec1b8e6 (patch) | |
| tree | 36775481b19e207f139d108aeb88875b695de181 /src/liballoc | |
| parent | 3d6f5100aff24aa97275dc92ade728caac605560 (diff) | |
| parent | a6f9180fd61f509ebc6d666eda3f6bb42dd02573 (diff) | |
| download | rust-265a23320dbeaeca45b889cfea684d71dec1b8e6.tar.gz rust-265a23320dbeaeca45b889cfea684d71dec1b8e6.zip | |
Auto merge of #21677 - japaric:no-range, r=alexcrichton
Note: Do not merge until we get a newer snapshot that includes #21374 There was some type inference fallout (see 4th commit) because type inference with `a..b` is not as good as with `range(a, b)` (see #21672). r? @alexcrichton
Diffstat (limited to 'src/liballoc')
| -rw-r--r-- | src/liballoc/arc.rs | 10 | ||||
| -rw-r--r-- | src/liballoc/boxed.rs | 4 | ||||
| -rw-r--r-- | src/liballoc/lib.rs | 2 |
3 files changed, 6 insertions, 10 deletions
diff --git a/src/liballoc/arc.rs b/src/liballoc/arc.rs index 1b75289c64f..f9f6de2df58 100644 --- a/src/liballoc/arc.rs +++ b/src/liballoc/arc.rs @@ -37,7 +37,7 @@ //! //! let five = Arc::new(5i); //! -//! for _ in range(0u, 10) { +//! for _ in 0u..10 { //! let five = five.clone(); //! //! Thread::spawn(move || { @@ -54,7 +54,7 @@ //! //! let five = Arc::new(Mutex::new(5i)); //! -//! for _ in range(0u, 10) { +//! for _ in 0u..10 { //! let five = five.clone(); //! //! Thread::spawn(move || { @@ -95,10 +95,10 @@ use heap::deallocate; /// use std::thread::Thread; /// /// fn main() { -/// let numbers: Vec<_> = range(0, 100u32).map(|i| i as f32).collect(); +/// let numbers: Vec<_> = (0..100u32).map(|i| i as f32).collect(); /// let shared_numbers = Arc::new(numbers); /// -/// for _ in range(0u, 10) { +/// for _ in 0u..10 { /// let child_numbers = shared_numbers.clone(); /// /// Thread::spawn(move || { @@ -814,6 +814,6 @@ mod tests { } // Make sure deriving works with Arc<T> - #[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Show, Default)] + #[derive(Eq, Ord, PartialEq, PartialOrd, Clone, Debug, Default)] struct Foo { inner: Arc<int> } } diff --git a/src/liballoc/boxed.rs b/src/liballoc/boxed.rs index 51e5fc5820c..91577e30d9a 100644 --- a/src/liballoc/boxed.rs +++ b/src/liballoc/boxed.rs @@ -29,7 +29,7 @@ //! Creating a recursive data structure: //! //! ``` -//! #[derive(Show)] +//! #[derive(Debug)] //! enum List<T> { //! Cons(T, Box<List<T>>), //! Nil, @@ -250,8 +250,6 @@ impl<T: ?Sized> DerefMut for Box<T> { fn deref_mut(&mut self) -> &mut T { &mut **self } } -// FIXME(#21363) remove `old_impl_check` when bug is fixed -#[old_impl_check] impl<'a, T> Iterator for Box<Iterator<Item=T> + 'a> { type Item = T; diff --git a/src/liballoc/lib.rs b/src/liballoc/lib.rs index 6830a1c33df..f807d8d12a6 100644 --- a/src/liballoc/lib.rs +++ b/src/liballoc/lib.rs @@ -70,8 +70,6 @@ #![feature(lang_items, unsafe_destructor)] #![feature(box_syntax)] #![feature(optin_builtin_traits)] -// FIXME(#21363) remove `old_impl_check` when bug is fixed -#![feature(old_impl_check)] #![allow(unknown_features)] #![feature(int_uint)] #![feature(core)] #![feature(hash)] |
