Skip to content

Commit 726c323

Browse files
committed
---
yaml --- r: 195321 b: refs/heads/snap-stage3 c: 64c48f3 h: refs/heads/master i: 195319: eeb0dc1 v: v3
1 parent efb12c5 commit 726c323

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

42 files changed

+142
-316
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
---
22
refs/heads/master: 14192d6df5cc714e5c9a3ca70b08f2514d977be2
33
refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
4-
refs/heads/snap-stage3: c89de2c56baeb61e7cc434924dcc8bedd32b26b8
4+
refs/heads/snap-stage3: 64c48f390ccd6410c02e96968a2cff187eeaf442
55
refs/heads/try: 961e0358e1a5c0faaef606e31e9965742c1643bf
66
refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
77
refs/heads/dist-snap: ba4081a5a8573875fed17545846f6f6902c8ba8d

branches/snap-stage3/src/libcollections/linked_list.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -951,7 +951,7 @@ impl<A: Hash> Hash for LinkedList<A> {
951951
#[cfg(test)]
952952
mod test {
953953
use std::clone::Clone;
954-
use std::iter::Iterator;
954+
use std::iter::{Iterator, IteratorExt};
955955
use std::option::Option::{Some, None, self};
956956
use std::rand;
957957
use std::thread;

branches/snap-stage3/src/libcollections/slice.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -76,6 +76,7 @@
7676
//! iterators.
7777
//! * Further methods that return iterators are `.split()`, `.splitn()`,
7878
//! `.chunks()`, `.windows()` and more.
79+
7980
#![doc(primitive = "slice")]
8081
#![stable(feature = "rust1", since = "1.0.0")]
8182

@@ -84,7 +85,7 @@ use core::convert::AsRef;
8485
use core::clone::Clone;
8586
use core::cmp::Ordering::{self, Greater, Less};
8687
use core::cmp::{self, Ord, PartialEq};
87-
use core::iter::Iterator;
88+
use core::iter::{Iterator, IteratorExt};
8889
use core::iter::MultiplicativeIterator;
8990
use core::marker::Sized;
9091
use core::mem::size_of;
@@ -130,7 +131,7 @@ mod hack {
130131
use alloc::boxed::Box;
131132
use core::clone::Clone;
132133
#[cfg(test)]
133-
use core::iter::Iterator;
134+
use core::iter::{Iterator, IteratorExt};
134135
use core::mem;
135136
#[cfg(test)]
136137
use core::option::Option::{Some, None};

branches/snap-stage3/src/libcollections/str.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,7 +58,7 @@ use self::DecompositionType::*;
5858

5959
use core::clone::Clone;
6060
use core::iter::AdditiveIterator;
61-
use core::iter::{Iterator, Extend};
61+
use core::iter::{Iterator, IteratorExt, Extend};
6262
use core::option::Option::{self, Some, None};
6363
use core::result::Result;
6464
use core::str as core_str;

branches/snap-stage3/src/libcollections/vec_deque.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1785,7 +1785,7 @@ impl<T: fmt::Debug> fmt::Debug for VecDeque<T> {
17851785

17861786
#[cfg(test)]
17871787
mod test {
1788-
use core::iter::{Iterator, self};
1788+
use core::iter::{IteratorExt, self};
17891789
use core::option::Option::Some;
17901790

17911791
use test;

branches/snap-stage3/src/libcollectionstest/bench.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ macro_rules! map_find_rand_bench {
6666
($name: ident, $n: expr, $map: ident) => (
6767
#[bench]
6868
pub fn $name(b: &mut ::test::Bencher) {
69-
use std::iter::Iterator;
69+
use std::iter::IteratorExt;
7070
use std::rand::Rng;
7171
use std::rand;
7272
use std::vec::Vec;

branches/snap-stage3/src/libcore/fmt/float.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ pub use self::SignFormat::*;
1717
use char;
1818
use char::CharExt;
1919
use fmt;
20-
use iter::Iterator;
20+
use iter::IteratorExt;
2121
use num::{cast, Float, ToPrimitive};
2222
use num::FpCategory as Fp;
2323
use ops::FnOnce;

branches/snap-stage3/src/libcore/fmt/mod.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
use any;
1616
use cell::{Cell, RefCell, Ref, RefMut, BorrowState};
1717
use char::CharExt;
18-
use iter::Iterator;
18+
use iter::{Iterator, IteratorExt};
1919
use marker::{Copy, PhantomData, Sized};
2020
use mem;
2121
use option::Option;

branches/snap-stage3/src/libcore/fmt/num.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
#![allow(unsigned_negation)]
1616

1717
use fmt;
18-
use iter::Iterator;
18+
use iter::IteratorExt;
1919
use num::{Int, cast};
2020
use slice::SliceExt;
2121
use str;

0 commit comments

Comments
 (0)