---

yaml
---
r: 63342
b: refs/heads/snap-stage3
c: da42e6b
h: refs/heads/master
v: v3

Author: bors

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: c7013ba1fcad7fcc84d7e6e93d7a0306c13bce47
+refs/heads/snap-stage3: da42e6b7a0fcadcca819d221738894dcb6c4b76d
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/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`,

branches/snap-stage3/doc/tutorial-tasks.md

@@ -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));
@@ -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 {

branches/snap-stage3/src/compiletest/header.rs

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

branches/snap-stage3/src/compiletest/procsrv.rs

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

branches/snap-stage3/src/compiletest/runtest.rs

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

branches/snap-stage3/src/etc/adb_run_wrapper.sh

@@ -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

branches/snap-stage3/src/libextra/deque.rs

@@ -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;

branches/snap-stage3/src/libextra/dlist.rs

@@ -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;

branches/snap-stage3/src/libextra/fileinput.rs

@@ -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;

branches/snap-stage3/src/libextra/getopts.rs

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

branches/snap-stage3/src/libextra/json.rs

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

branches/snap-stage3/src/libextra/list.rs

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

branches/snap-stage3/src/libextra/net_ip.rs

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

branches/snap-stage3/src/libextra/net_url.rs

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

branches/snap-stage3/src/libextra/num/bigint.rs

@@ -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};

branches/snap-stage3/src/libextra/num/rational.rs

@@ -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};

branches/snap-stage3/src/libextra/par.rs

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

branches/snap-stage3/src/libextra/rope.rs

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

branches/snap-stage3/src/libextra/semver.rs

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

branches/snap-stage3/src/libextra/sha1.rs

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

branches/snap-stage3/src/libextra/stats.rs

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

branches/snap-stage3/src/libextra/term.rs

@@ -20,7 +20,7 @@ use core::os;
 use terminfo::*;
 use terminfo::searcher::open;
 use terminfo::parser::compiled::parse;
-use terminfo::parm::{expand, Number};
+use terminfo::parm::{expand, Number, Variables};
 
 // FIXME (#2807): Windows support.
 
@@ -84,7 +84,7 @@ impl Terminal {
     pub fn fg(&self, color: u8) {
         if self.color_supported {
             let s = expand(*self.ti.strings.find_equiv(&("setaf")).unwrap(),
-                           [Number(color as int)], [], []);
+                           [Number(color as int)], &mut Variables::new());
             if s.is_ok() {
                 self.out.write(s.get());
             } else {
@@ -95,7 +95,7 @@ impl Terminal {
     pub fn bg(&self, color: u8) {
         if self.color_supported {
             let s = expand(*self.ti.strings.find_equiv(&("setab")).unwrap(),
-                           [Number(color as int)], [], []);
+                           [Number(color as int)], &mut Variables::new());
             if s.is_ok() {
                 self.out.write(s.get());
             } else {
@@ -105,7 +105,8 @@ impl Terminal {
     }
     pub fn reset(&self) {
         if self.color_supported {
-            let s = expand(*self.ti.strings.find_equiv(&("op")).unwrap(), [], [], []);
+            let mut vars = Variables::new();
+            let s = expand(*self.ti.strings.find_equiv(&("op")).unwrap(), [], &mut vars);
             if s.is_ok() {
                 self.out.write(s.get());
             } else {