Skip to content

transitioning to Iterator #7078

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 4 commits into from
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 1 addition & 2 deletions doc/tutorial-tasks.md
Original file line number Diff line number Diff line change
Expand Up @@ -327,7 +327,7 @@ fn main() {
let mut futures = vec::from_fn(1000, |ind| do extra::future::spawn { partial_sum(ind) });

let mut final_res = 0f64;
for futures.each_mut |ft| {
for futures.mut_iter().advance |ft| {
final_res += ft.get();
}
println(fmt!("π^2/6 is not far from : %?", final_res));
Expand All @@ -351,7 +351,6 @@ a single large vector of floats. Each task needs the full vector to perform its
# use std::vec;
# use std::uint;
# use std::rand;
# use std::iterator::IteratorUtil;
use extra::arc::ARC;

fn pnorm(nums: &~[float], p: uint) -> float {
Expand Down
1 change: 0 additions & 1 deletion src/compiletest/header.rs
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@ use core::prelude::*;
use common::config;
use common;

use core::iterator::IteratorUtil;
use core::io;
use core::os;

Expand Down
1 change: 0 additions & 1 deletion src/compiletest/procsrv.rs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@
// except according to those terms.

use core::prelude::*;
use core::iterator::IteratorUtil;

use core::os;
use core::run;
Expand Down
1 change: 0 additions & 1 deletion src/compiletest/runtest.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ use procsrv;
use util;
use util::logv;

use core::iterator::IteratorUtil;
use core::io;
use core::os;
use core::str;
Expand Down
2 changes: 1 addition & 1 deletion src/libextra/deque.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ impl<T> Container for Deque<T> {
impl<T> Mutable for Deque<T> {
/// Clear the deque, removing all values.
fn clear(&mut self) {
for self.elts.each_mut |x| { *x = None }
for self.elts.mut_iter().advance |x| { *x = None }
self.nelts = 0;
self.lo = 0;
self.hi = 0;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/dlist.rs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ Do not use ==, !=, <, etc on doubly-linked lists -- it may not terminate.

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::managed;
use core::old_iter;
use core::vec;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/fileinput.rs
Original file line number Diff line number Diff line change
Expand Up @@ -414,7 +414,6 @@ mod test {

use super::{FileInput, pathify, input_vec, input_vec_state};

use core::iterator::IteratorUtil;
use core::io;
use core::uint;
use core::vec;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/getopts.rs
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::cmp::Eq;
use core::result::{Err, Ok};
use core::result;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/json.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::char;
use core::float;
use core::hashmap::HashMap;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/list.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;

#[deriving(Eq)]
pub enum List<T> {
Expand Down
1 change: 0 additions & 1 deletion src/libextra/net_ip.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::libc;
use core::comm::{stream, SharedChan};
use core::ptr;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/net_url.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::cmp::Eq;
use core::io::{Reader, ReaderUtil};
use core::io;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/num/bigint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ A BigInt is a combination of BigUint and Sign.
#[allow(missing_doc)];

use core::prelude::*;
use core::iterator::IteratorUtil;
use core::cmp::{Eq, Ord, TotalEq, TotalOrd, Ordering, Less, Equal, Greater};
use core::int;
use core::num::{IntConvertible, Zero, One, ToStrRadix, FromStrRadix, Orderable};
Expand Down
1 change: 0 additions & 1 deletion src/libextra/num/rational.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::cmp;
use core::from_str::FromStr;
use core::num::{Zero,One,ToStrRadix,FromStrRadix,Round};
Expand Down
1 change: 0 additions & 1 deletion src/libextra/par.rs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::cast;
use core::ptr;
use core::sys;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/rope.rs
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::uint;
use core::vec;
use core::str;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/semver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::char;
use core::cmp;
use core::io::{ReaderUtil};
Expand Down
2 changes: 1 addition & 1 deletion src/libextra/sha1.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::str;
use core::uint;
use core::vec;

Expand Down
2 changes: 1 addition & 1 deletion src/libextra/stats.rs
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@

use core::prelude::*;

use core::iterator::*;
use core::vec;
use core::f64;
use core::cmp;
use core::num;
Expand Down
1 change: 0 additions & 1 deletion src/libextra/terminfo/parser/compiled.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@ use core::prelude::*;

use core::{vec, int, str};
use core::io::Reader;
use core::iterator::IteratorUtil;
use core::hashmap::HashMap;
use super::super::TermInfo;

Expand Down
1 change: 0 additions & 1 deletion src/libextra/terminfo/searcher.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use core::prelude::*;
use core::{os, str};
use core::os::getenv;
use core::io::{file_reader, Reader};
use core::iterator::IteratorUtil;
use path = core::path::Path;

/// Return path to database entry for `term`
Expand Down
1 change: 0 additions & 1 deletion src/libextra/time.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ use core::i32;
use core::int;
use core::io;
use core::str;
use core::iterator::IteratorUtil;

static NSEC_PER_SEC: i32 = 1_000_000_000_i32;

Expand Down
3 changes: 0 additions & 3 deletions src/libextra/treemap.rs
Original file line number Diff line number Diff line change
Expand Up @@ -14,7 +14,6 @@

use core::prelude::*;

use core::iterator::*;
use core::uint;
use core::util::{swap, replace};

Expand Down Expand Up @@ -709,7 +708,6 @@ mod test_treemap {

use super::*;

use core::iterator::*;
use core::rand::RngUtil;
use core::rand;
use core::str;
Expand Down Expand Up @@ -1030,7 +1028,6 @@ mod test_treemap {
#[cfg(test)]
mod test_set {
use core::prelude::*;
use core::iterator::*;

use super::*;

Expand Down
1 change: 0 additions & 1 deletion src/librust/rust.rc
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,6 @@ extern mod rusti;
extern mod rustc;

use core::prelude::*;
use core::iterator::IteratorUtil;

use core::io;
use core::os;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/back/link.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ use middle::trans::common::CrateContext;
use middle::ty;
use util::ppaux;

use core::iterator::IteratorUtil;
use core::char;
use core::hash::Streaming;
use core::hash;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/driver/driver.rs
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@ use middle;
use util::common::time;
use util::ppaux;

use core::iterator::IteratorUtil;
use core::hashmap::HashMap;
use core::int;
use core::io;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/metadata/cstore.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use core::prelude::*;
use metadata::cstore;
use metadata::decoder;

use core::iterator::IteratorUtil;
use core::hashmap::HashMap;
use core::vec;
use extra;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/metadata/encoder.rs
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,6 @@ use middle::ty;
use middle;
use util::ppaux::ty_to_str;

use core::iterator::IteratorUtil;
use core::hash::HashUtil;
use core::hashmap::HashMap;
use core::int;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/astencode.rs
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,6 @@ use middle::{ty, typeck, moves};
use middle;
use util::ppaux::ty_to_str;

use core::iterator::IteratorUtil;
use core::at_vec;
use core::uint;
use extra::ebml::reader;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/borrowck/check_loans.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@
// 4. moves do not affect things loaned out in any way

use core::prelude::*;
use core::iterator::IteratorUtil;

use core::hashmap::HashSet;
use core::uint;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/borrowck/gather_loans/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
// sure that all of these loans are honored.

use core::prelude::*;
use core::iterator::IteratorUtil;

use middle::borrowck::*;
use middle::borrowck::move_data::MoveData;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/borrowck/move_data.rs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,6 @@ comments in the section "Moves and initialization" and in `doc.rs`.
*/

use core::prelude::*;
use core::iterator::IteratorUtil;

use core::hashmap::{HashMap, HashSet};
use core::uint;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/check_const.rs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@
// option. This file may not be copied, modified, or distributed
// except according to those terms.

use core::iterator::IteratorUtil;
use core::prelude::*;

use driver::session::Session;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/check_match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,6 @@ use middle::typeck::method_map;
use middle::moves;
use util::ppaux::ty_to_str;

use core::iterator::IteratorUtil;
use core::uint;
use core::vec;
use extra::sort;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/const_eval.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ use middle;
use syntax::{ast, ast_map, ast_util, visit};
use syntax::ast::*;

use core::iterator::IteratorUtil;
use core::float;
use core::hashmap::{HashMap, HashSet};
use core::vec;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/dataflow.rs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@

use core::prelude::*;

use core::iterator::IteratorUtil;
use core::cast;
use core::io;
use core::uint;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/kind.rs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ use middle::typeck;
use util::ppaux::{Repr, ty_to_str};
use util::ppaux::UserString;

use core::iterator::IteratorUtil;
use core::vec;
use syntax::ast::*;
use syntax::attr::attrs_contains_name;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/lint.rs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,6 @@ use middle::ty;
use middle::pat_util;
use util::ppaux::{ty_to_str};

use core::iterator::IteratorUtil;
use core::char;
use core::cmp;
use core::hashmap::HashMap;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/liveness.rs
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,6 @@ use middle::ty;
use middle::typeck;
use middle::moves;

use core::iterator::IteratorUtil;
use core::cast::transmute;
use core::hashmap::HashMap;
use core::io;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/mem_categorization.rs
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,6 @@
*/

use core::prelude::*;
use core::iterator::IteratorUtil;

use middle::ty;
use middle::typeck;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/moves.rs
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,6 @@ and so on.
*/

use core::prelude::*;
use core::iterator::IteratorUtil;

use middle::pat_util::{pat_bindings};
use middle::freevars;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/region.rs
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,6 @@ use middle::ty::{region_variance, rv_covariant, rv_invariant};
use middle::ty::{rv_contravariant, FreeRegion};
use middle::ty;

use core::iterator::IteratorUtil;
use core::hashmap::{HashMap, HashSet};
use syntax::ast_map;
use syntax::codemap::span;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/resolve.rs
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ use syntax::visit::{visit_foreign_item, visit_item};
use syntax::visit::{visit_mod, visit_ty, vt};
use syntax::opt_vec::OptVec;

use core::iterator::IteratorUtil;
use core::str;
use core::uint;
use core::vec;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/trans/_match.rs
Original file line number Diff line number Diff line change
Expand Up @@ -172,7 +172,6 @@ use middle::trans::type_of;
use middle::ty;
use util::common::indenter;

use core::iterator::IteratorUtil;
use core::hashmap::HashMap;
use core::vec;
use syntax::ast;
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/trans/adt.rs
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,6 @@
* taken to it, implementing them for Rust seems difficult.
*/

use core::iterator::IteratorUtil;
use core::container::Map;
use core::libc::c_ulonglong;
use core::option::{Option, Some, None};
Expand Down
1 change: 0 additions & 1 deletion src/librustc/middle/trans/base.rs
Original file line number Diff line number Diff line change
Expand Up @@ -64,7 +64,6 @@ use middle::ty;
use util::common::indenter;
use util::ppaux::{Repr, ty_to_str};

use core::iterator::IteratorUtil;
use core::hash;
use core::hashmap::{HashMap, HashSet};
use core::int;
Expand Down
Loading