---

yaml
---
r: 65913
b: refs/heads/master
c: 1104e65
h: refs/heads/master
i:
  65911: b37ffe4
v: v3

Author: bors

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 824a6277af9e614767e0570ecc282065256ac32a
+refs/heads/master: 1104e659d539faf40773cd6dc01015c00df498cd
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
 refs/heads/snap-stage3: 18e3db7392d2d0697b7e27d6d986139960144d85
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9

trunk/RELEASES.txt

@@ -4,7 +4,7 @@ Version 0.7 (July 2013)
    * ??? changes, numerous bugfixes
 
    * Syntax changes
-      * `#[deriving(Encodable)]`, `#[deriving(Decodable)]`      
+      * `#[deriving(Encodable)]`, `#[deriving(Decodable)]`
 
    * Semantic changes
       * The `self` parameter no longer implicitly means `&'self self`,

trunk/doc/tutorial-tasks.md

@@ -13,6 +13,7 @@ use core::prelude::*;
 use common::config;
 use common;
 
+use core::iterator::IteratorUtil;
 use core::io;
 use core::os;
 

trunk/src/compiletest/header.rs

@@ -9,6 +9,7 @@
 // except according to those terms.
 
 use core::prelude::*;
+use core::iterator::IteratorUtil;
 
 use core::os;
 use core::run;

trunk/src/compiletest/procsrv.rs

@@ -22,6 +22,7 @@ use procsrv;
 use util;
 use util::logv;
 
+use core::iterator::IteratorUtil;
 use core::io;
 use core::os;
 use core::str;

trunk/src/compiletest/runtest.rs

@@ -2,7 +2,7 @@
 # usage : adb_run_wrapper [test dir - where test executables exist] [test executable]
 #
 
-# Sometimes android shell produce exitcode "1 : Text File Busy" 
+# Sometimes android shell produce exitcode "1 : Text File Busy"
 # Retry after $WAIT seconds, expecting resource cleaned-up
 WAIT=10
 PATH=$1
@@ -20,15 +20,15 @@ then
         while [ $L_RET -eq 1 ]
         do
             LD_LIBRARY_PATH=$PATH $PATH/$RUN $@ 1>$PATH/$RUN.stdout 2>$PATH/$RUN.stderr
-            L_RET=$? 
+            L_RET=$?
             if [ $L_COUNT -gt 0 ]
             then
                /system/bin/sleep $WAIT
                /system/bin/sync
             fi
             L_COUNT=`expr $L_COUNT+1`
         done
-        
+
         echo $L_RET > $PATH/$RUN.exitcode
 
     fi

trunk/src/etc/adb_run_wrapper.sh

@@ -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.mut_iter().advance |x| { *x = None }
+        for self.elts.each_mut |x| { *x = None }
         self.nelts = 0;
         self.lo = 0;
         self.hi = 0;

trunk/src/libextra/deque.rs

@@ -20,6 +20,7 @@ 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;

trunk/src/libextra/dlist.rs

@@ -414,6 +414,7 @@ mod test {
 
     use super::{FileInput, pathify, input_vec, input_vec_state};
 
+    use core::iterator::IteratorUtil;
     use core::io;
     use core::uint;
     use core::vec;

trunk/src/libextra/fileinput.rs

@@ -83,6 +83,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::cmp::Eq;
 use core::result::{Err, Ok};
 use core::result;

trunk/src/libextra/getopts.rs

@@ -18,6 +18,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::char;
 use core::float;
 use core::hashmap::HashMap;

trunk/src/libextra/json.rs

@@ -12,6 +12,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 
 #[deriving(Eq)]
 pub enum List<T> {

trunk/src/libextra/list.rs

@@ -14,6 +14,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::libc;
 use core::comm::{stream, SharedChan};
 use core::ptr;

trunk/src/libextra/net_ip.rs

@@ -14,6 +14,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::cmp::Eq;
 use core::io::{Reader, ReaderUtil};
 use core::io;

trunk/src/libextra/net_url.rs

@@ -19,6 +19,7 @@ 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};

trunk/src/libextra/num/bigint.rs

@@ -12,6 +12,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::cmp;
 use core::from_str::FromStr;
 use core::num::{Zero,One,ToStrRadix,FromStrRadix,Round};

trunk/src/libextra/num/rational.rs

@@ -10,6 +10,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::cast;
 use core::ptr;
 use core::sys;

trunk/src/libextra/par.rs

@@ -37,6 +37,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::uint;
 use core::vec;
 use core::str;

trunk/src/libextra/rope.rs

@@ -14,6 +14,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::char;
 use core::cmp;
 use core::io::{ReaderUtil};

trunk/src/libextra/semver.rs

@@ -24,7 +24,7 @@
 
 use core::prelude::*;
 
-use core::str;
+use core::iterator::IteratorUtil;
 use core::uint;
 use core::vec;
 

trunk/src/libextra/sha1.rs

@@ -12,7 +12,7 @@
 
 use core::prelude::*;
 
-use core::vec;
+use core::iterator::*;
 use core::f64;
 use core::cmp;
 use core::num;

trunk/src/libextra/stats.rs

@@ -14,6 +14,7 @@ use core::prelude::*;
 
 use core::{vec, int, str};
 use core::io::Reader;
+use core::iterator::IteratorUtil;
 use core::hashmap::HashMap;
 use super::super::TermInfo;
 

trunk/src/libextra/terminfo/parser/compiled.rs

@@ -15,6 +15,7 @@ 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`

trunk/src/libextra/terminfo/searcher.rs

@@ -16,6 +16,7 @@ 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;
 

trunk/src/libextra/time.rs

@@ -14,6 +14,7 @@
 
 use core::prelude::*;
 
+use core::iterator::*;
 use core::uint;
 use core::util::{swap, replace};
 
@@ -708,6 +709,7 @@ mod test_treemap {
 
     use super::*;
 
+    use core::iterator::*;
     use core::rand::RngUtil;
     use core::rand;
     use core::str;
@@ -1028,6 +1030,7 @@ mod test_treemap {
 #[cfg(test)]
 mod test_set {
     use core::prelude::*;
+    use core::iterator::*;
 
     use super::*;
 

trunk/src/libextra/treemap.rs

@@ -30,6 +30,7 @@ extern mod rusti;
 extern mod rustc;
 
 use core::prelude::*;
+use core::iterator::IteratorUtil;
 
 use core::io;
 use core::os;

trunk/src/librust/rust.rc

@@ -22,6 +22,7 @@ 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;

trunk/src/librustc/back/link.rs

@@ -24,6 +24,7 @@ use middle;
 use util::common::time;
 use util::ppaux;
 
+use core::iterator::IteratorUtil;
 use core::hashmap::HashMap;
 use core::int;
 use core::io;

trunk/src/librustc/driver/driver.rs

@@ -17,6 +17,7 @@ use core::prelude::*;
 use metadata::cstore;
 use metadata::decoder;
 
+use core::iterator::IteratorUtil;
 use core::hashmap::HashMap;
 use core::vec;
 use extra;

trunk/src/librustc/metadata/cstore.rs

@@ -22,6 +22,7 @@ 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;

trunk/src/librustc/metadata/encoder.rs

@@ -25,6 +25,7 @@ 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;

trunk/src/librustc/middle/astencode.rs

@@ -18,6 +18,7 @@
 // 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;

trunk/src/librustc/middle/borrowck/check_loans.rs

@@ -161,4 +161,3 @@ fn check_is_legal_to_move_from(bccx: @BorrowckCtxt,
         }
     }
 }
-

trunk/src/librustc/middle/borrowck/gather_loans/gather_moves.rs

@@ -17,6 +17,7 @@
 // sure that all of these loans are honored.
 
 use core::prelude::*;
+use core::iterator::IteratorUtil;
 
 use middle::borrowck::*;
 use middle::borrowck::move_data::MoveData;

trunk/src/librustc/middle/borrowck/gather_loans/mod.rs

@@ -16,6 +16,7 @@ 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;

trunk/src/librustc/middle/borrowck/move_data.rs

@@ -8,6 +8,7 @@
 // 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;

trunk/src/librustc/middle/check_const.rs

@@ -19,6 +19,7 @@ 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;

trunk/src/librustc/middle/check_match.rs

@@ -18,6 +18,7 @@ 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;

trunk/src/librustc/middle/const_eval.rs

@@ -18,6 +18,7 @@
 
 use core::prelude::*;
 
+use core::iterator::IteratorUtil;
 use core::cast;
 use core::io;
 use core::uint;

trunk/src/librustc/middle/dataflow.rs

@@ -154,4 +154,3 @@ pub fn check_crate(tcx: ty::ctxt,
 
     visit::visit_crate(crate, ((), visitor))
 }
-

trunk/src/librustc/middle/effect.rs

@@ -17,6 +17,7 @@ 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;

trunk/src/librustc/middle/kind.rs

@@ -15,6 +15,7 @@ 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;

trunk/src/librustc/middle/lint.rs

@@ -110,6 +110,7 @@ use middle::ty;
 use middle::typeck;
 use middle::moves;
 
+use core::iterator::IteratorUtil;
 use core::cast::transmute;
 use core::hashmap::HashMap;
 use core::io;