Skip to content

Commit 1ba6fa4

Browse files
committed
auto merge of #7110 : thestinger/rust/iterator, r=brson
2 parents 1104e65 + 824a627 commit 1ba6fa4

File tree

121 files changed

+13
-273
lines changed

Some content is hidden

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

121 files changed

+13
-273
lines changed

doc/tutorial-tasks.md

Lines changed: 1 addition & 2 deletions

src/compiletest/header.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ use core::prelude::*;
1313
use common::config;
1414
use common;
1515

16-
use core::iterator::IteratorUtil;
1716
use core::io;
1817
use core::os;
1918

src/compiletest/procsrv.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
// except according to those terms.
1010

1111
use core::prelude::*;
12-
use core::iterator::IteratorUtil;
1312

1413
use core::os;
1514
use core::run;

src/compiletest/runtest.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,6 @@ use procsrv;
2222
use util;
2323
use util::logv;
2424

25-
use core::iterator::IteratorUtil;
2625
use core::io;
2726
use core::os;
2827
use core::str;

src/libextra/deque.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ impl<T> Container for Deque<T> {
3737
impl<T> Mutable for Deque<T> {
3838
/// Clear the deque, removing all values.
3939
fn clear(&mut self) {
40-
for self.elts.each_mut |x| { *x = None }
40+
for self.elts.mut_iter().advance |x| { *x = None }
4141
self.nelts = 0;
4242
self.lo = 0;
4343
self.hi = 0;

src/libextra/dlist.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.
2020

2121
use core::prelude::*;
2222

23-
use core::iterator::IteratorUtil;
2423
use core::managed;
2524
use core::old_iter;
2625
use core::vec;

src/libextra/fileinput.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -414,7 +414,6 @@ mod test {
414414
415415
use super::{FileInput, pathify, input_vec, input_vec_state};
416416
417-
use core::iterator::IteratorUtil;
418417
use core::io;
419418
use core::uint;
420419
use core::vec;

src/libextra/getopts.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -83,7 +83,6 @@
8383

8484
use core::prelude::*;
8585

86-
use core::iterator::IteratorUtil;
8786
use core::cmp::Eq;
8887
use core::result::{Err, Ok};
8988
use core::result;

src/libextra/json.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,6 @@
1818
1919
use core::prelude::*;
2020

21-
use core::iterator::IteratorUtil;
2221
use core::char;
2322
use core::float;
2423
use core::hashmap::HashMap;

src/libextra/list.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,6 @@
1212
1313
use core::prelude::*;
1414

15-
use core::iterator::IteratorUtil;
1615

1716
#[deriving(Eq)]
1817
pub enum List<T> {

0 commit comments

Comments
 (0)