Skip to content

Commit 24a81d8

Browse files
committed
---
yaml --- r: 194921 b: refs/heads/auto c: 27af78c h: refs/heads/master i: 194919: 2ac2fc9 v: v3
1 parent d2d4108 commit 24a81d8

File tree

34 files changed

+131
-130
lines changed

34 files changed

+131
-130
lines changed

[refs]

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
1010
refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
1111
refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
1212
refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
13-
refs/heads/auto: 64c48f390ccd6410c02e96968a2cff187eeaf442
13+
refs/heads/auto: 27af78c6dddc95c7c82dc21926d6ea81562e1211
1414
refs/heads/servo: af82457af293e2a842ba6b7759b70288da276167
1515
refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
1616
refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336

branches/auto/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, IteratorExt};
954+
use std::iter::Iterator;
955955
use std::option::Option::{Some, None, self};
956956
use std::rand;
957957
use std::thread;

branches/auto/src/libcollections/slice.rs

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

@@ -85,7 +84,7 @@ use core::convert::AsRef;
8584
use core::clone::Clone;
8685
use core::cmp::Ordering::{self, Greater, Less};
8786
use core::cmp::{self, Ord, PartialEq};
88-
use core::iter::{Iterator, IteratorExt};
87+
use core::iter::Iterator;
8988
use core::iter::MultiplicativeIterator;
9089
use core::marker::Sized;
9190
use core::mem::size_of;
@@ -131,7 +130,7 @@ mod hack {
131130
use alloc::boxed::Box;
132131
use core::clone::Clone;
133132
#[cfg(test)]
134-
use core::iter::{Iterator, IteratorExt};
133+
use core::iter::Iterator;
135134
use core::mem;
136135
#[cfg(test)]
137136
use core::option::Option::{Some, None};

branches/auto/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, IteratorExt, Extend};
61+
use core::iter::{Iterator, Extend};
6262
use core::option::Option::{self, Some, None};
6363
use core::result::Result;
6464
use core::str as core_str;

branches/auto/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::{IteratorExt, self};
1788+
use core::iter::{Iterator, self};
17891789
use core::option::Option::Some;
17901790

17911791
use test;

branches/auto/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::IteratorExt;
69+
use std::iter::Iterator;
7070
use std::rand::Rng;
7171
use std::rand;
7272
use std::vec::Vec;

branches/auto/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::IteratorExt;
20+
use iter::Iterator;
2121
use num::{cast, Float, ToPrimitive};
2222
use num::FpCategory as Fp;
2323
use ops::FnOnce;

branches/auto/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, IteratorExt};
18+
use iter::Iterator;
1919
use marker::{Copy, PhantomData, Sized};
2020
use mem;
2121
use option::Option;

branches/auto/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::IteratorExt;
18+
use iter::Iterator;
1919
use num::{Int, cast};
2020
use slice::SliceExt;
2121
use str;

0 commit comments

Comments
 (0)