---

yaml
---
r: 63676
b: refs/heads/snap-stage3
c: 5242e8d
h: refs/heads/master
v: v3

Author: thestinger

[refs]

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

branches/snap-stage3/src/librustc/metadata/encoder.rs

@@ -731,8 +731,8 @@ fn encode_info_for_method(ecx: &EncodeContext,
     }
 
     let mut combined_ty_params = opt_vec::Empty;
-    for owner_generics.ty_params.each |x| { combined_ty_params.push(copy *x) }
-    for method_generics.ty_params.each |x| { combined_ty_params.push(copy *x) }
+    for owner_generics.ty_params.iter().advance |x| { combined_ty_params.push(copy *x) }
+    for method_generics.ty_params.iter().advance |x| { combined_ty_params.push(copy *x) }
     let len = combined_ty_params.len();
     encode_type_param_bounds(ebml_w, ecx, &combined_ty_params);
 

branches/snap-stage3/src/librustc/middle/resolve.rs

@@ -3834,8 +3834,8 @@ impl Resolver {
     pub fn resolve_type_parameters(@mut self,
                                    type_parameters: &OptVec<TyParam>,
                                    visitor: ResolveVisitor) {
-        for type_parameters.each |type_parameter| {
-            for type_parameter.bounds.each |bound| {
+        for type_parameters.iter().advance |type_parameter| {
+            for type_parameter.bounds.iter().advance |bound| {
                 self.resolve_type_parameter_bound(bound, visitor);
             }
         }
@@ -4181,13 +4181,13 @@ impl Resolver {
                     }
                 }
 
-                for bounds.each |bound| {
+                for bounds.iter().advance |bound| {
                     self.resolve_type_parameter_bound(bound, visitor);
                 }
             }
 
             ty_closure(c) => {
-                for c.bounds.each |bound| {
+                for c.bounds.iter().advance |bound| {
                     self.resolve_type_parameter_bound(bound, visitor);
                 }
                 visit_ty(ty, ((), visitor));

branches/snap-stage3/src/librustc/middle/typeck/astconv.rs

@@ -752,7 +752,7 @@ fn conv_builtin_bounds(tcx: ty::ctxt,
     //! legal.
 
     let mut builtin_bounds = ty::EmptyBuiltinBounds();
-    for ast_bounds.each |ast_bound| {
+    for ast_bounds.iter().advance |ast_bound| {
         match *ast_bound {
             ast::TraitTyParamBound(b) => {
                 match lookup_def_tcx(tcx, b.path.span, b.ref_id) {

branches/snap-stage3/src/librustc/middle/typeck/collect.rs

@@ -775,7 +775,7 @@ pub fn ensure_no_ty_param_bounds(ccx: &CrateCtxt,
                                  span: span,
                                  generics: &ast::Generics,
                                  thing: &'static str) {
-    for generics.ty_params.each |ty_param| {
+    for generics.ty_params.iter().advance |ty_param| {
         if ty_param.bounds.len() > 0 {
             ccx.tcx.sess.span_err(
                 span,
@@ -1172,7 +1172,7 @@ pub fn ty_generics(ccx: &CrateCtxt,
             builtin_bounds: ty::EmptyBuiltinBounds(),
             trait_bounds: ~[]
         };
-        for ast_bounds.each |ast_bound| {
+        for ast_bounds.iter().advance |ast_bound| {
             match *ast_bound {
                 TraitTyParamBound(b) => {
                     let ty = ty::mk_param(ccx.tcx, param_ty.idx, param_ty.def_id);

branches/snap-stage3/src/librustc/middle/typeck/rscope.rs

@@ -57,7 +57,7 @@ impl RegionParamNames {
     }
 
     fn has_ident(&self, ident: ast::ident) -> bool {
-        for self.each |region_param_name| {
+        for self.iter().advance |region_param_name| {
             if *region_param_name == ident {
                 return true;
             }

branches/snap-stage3/src/libsyntax/abi.rs

@@ -8,7 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::to_bytes;
+use core::prelude::*;
+
+use core::to_bytes;
 
 #[deriving(Eq)]
 pub enum Abi {

branches/snap-stage3/src/libsyntax/ast.rs

@@ -10,16 +10,18 @@
 
 // The Rust abstract syntax tree.
 
+use core::prelude::*;
+
 use codemap::{span, spanned};
 use abi::AbiSet;
 use opt_vec::OptVec;
 use parse::token::{interner_get, str_to_ident};
 
-use std::hashmap::HashMap;
-use std::option::Option;
-use std::to_bytes::IterBytes;
-use std::to_bytes;
-use std::to_str::ToStr;
+use core::hashmap::HashMap;
+use core::option::Option;
+use core::to_bytes::IterBytes;
+use core::to_bytes;
+use core::to_str::ToStr;
 use extra::serialize::{Encodable, Decodable, Encoder, Decoder};
 
 

branches/snap-stage3/src/libsyntax/ast_map.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use abi::AbiSet;
 use ast::*;
 use ast;
@@ -20,9 +22,9 @@ use print::pprust;
 use visit;
 use syntax::parse::token::special_idents;
 
-use std::cmp;
-use std::hashmap::HashMap;
-use std::vec;
+use core::cmp;
+use core::hashmap::HashMap;
+use core::vec;
 
 pub enum path_elt {
     path_mod(ident),

branches/snap-stage3/src/libsyntax/ast_util.rs

@@ -8,20 +8,22 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use ast::*;
 use ast;
 use ast_util;
 use codemap::{span, spanned};
+use core::cast;
+use core::local_data;
 use opt_vec;
 use parse::token;
 use visit;
 
-use std::hashmap::HashMap;
-use std::int;
-use std::option;
-use std::to_bytes;
-use std::cast;
-use std::local_data;
+use core::hashmap::HashMap;
+use core::int;
+use core::option;
+use core::to_bytes;
 
 pub fn path_name_i(idents: &[ident]) -> ~str {
     // FIXME: Bad copies (#2543 -- same for everything else that says "bad")
@@ -392,10 +394,10 @@ impl id_range {
 
 pub fn id_visitor<T: Copy>(vfn: @fn(node_id, T)) -> visit::vt<T> {
     let visit_generics: @fn(&Generics, T) = |generics, t| {
-        for generics.ty_params.each |p| {
+        for generics.ty_params.iter().advance |p| {
             vfn(p.id, copy t);
         }
-        for generics.lifetimes.each |p| {
+        for generics.lifetimes.iter().advance |p| {
             vfn(p.id, copy t);
         }
     };
@@ -791,7 +793,7 @@ pub fn getLast(arr: &~[Mrk]) -> uint {
 mod test {
     use ast::*;
     use super::*;
-    use std::io;
+    use core::io;
 
     #[test] fn xorpush_test () {
         let mut s = ~[];

branches/snap-stage3/src/libsyntax/attr.rs

@@ -10,7 +10,7 @@
 
 // Functions dealing with attributes and meta_items
 
-extern mod extra;
+use core::prelude::*;
 
 use ast;
 use codemap::{spanned, dummy_spanned};
@@ -19,8 +19,10 @@ use codemap::BytePos;
 use diagnostic::span_handler;
 use parse::comments::{doc_comment_style, strip_doc_comment_decoration};
 
-use std::hashmap::HashSet;
-use std::vec;
+use core::hashmap::HashSet;
+use core::vec;
+use extra;
+
 /* Constructors */
 
 pub fn mk_name_value_item_str(name: @str, value: @str)

branches/snap-stage3/src/libsyntax/codemap.rs

@@ -21,9 +21,11 @@ source code snippets, etc.
 
 */
 
-use std::cmp;
-use std::to_bytes;
-use std::uint;
+use core::prelude::*;
+
+use core::cmp;
+use core::to_bytes;
+use core::uint;
 use extra::serialize::{Encodable, Decodable, Encoder, Decoder};
 
 pub trait Pos {

branches/snap-stage3/src/libsyntax/diagnostic.rs

@@ -8,12 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use codemap::{Pos, span};
 use codemap;
 
-use std::io;
-use std::uint;
-use std::vec;
+use core::io;
+use core::uint;
+use core::vec;
 use extra::term;
 
 pub type Emitter = @fn(cmsp: Option<(@codemap::CodeMap, span)>,

branches/snap-stage3/src/libsyntax/ext/asm.rs

@@ -12,15 +12,16 @@
  * Inline assembly support.
  */
 
+use core::prelude::*;
+
+use core::vec;
 use ast;
 use codemap::span;
 use ext::base;
 use ext::base::*;
 use parse;
 use parse::token;
 
-use std::vec;
-
 enum State {
     Asm,
     Outputs,

branches/snap-stage3/src/libsyntax/ext/base.rs

@@ -8,6 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
+use core::vec;
 use ast;
 use ast::Name;
 use codemap;
@@ -19,8 +22,7 @@ use parse;
 use parse::token;
 use parse::token::{ident_to_str, intern, str_to_ident};
 
-use std::vec;
-use std::hashmap::HashMap;
+use core::hashmap::HashMap;
 
 // new-style macro! tt code:
 //
@@ -533,7 +535,7 @@ fn satisfies_pred<K : Eq + Hash + IterBytes,V>(map : &mut HashMap<K,V>,
 #[cfg(test)]
 mod test {
     use super::MapChain;
-    use std::hashmap::HashMap;
+    use core::hashmap::HashMap;
 
     #[test] fn testenv () {
         let mut a = HashMap::new();

branches/snap-stage3/src/libsyntax/ext/build.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use abi::AbiSet;
 use ast::ident;
 use ast;

branches/snap-stage3/src/libsyntax/ext/concat_idents.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use ast;
 use codemap::span;
 use ext::base::*;

branches/snap-stage3/src/libsyntax/ext/deriving/clone.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use ast::{meta_item, item, expr};
 use codemap::span;
 use ext::base::ExtCtxt;

branches/snap-stage3/src/libsyntax/ext/deriving/cmp/eq.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use ast::{meta_item, item, expr};
 use codemap::span;
 use ext::base::ExtCtxt;

branches/snap-stage3/src/libsyntax/ext/deriving/cmp/ord.rs

@@ -8,6 +8,8 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use ast;
 use ast::{meta_item, item, expr};
 use codemap::span;

branches/snap-stage3/src/libsyntax/ext/deriving/cmp/totaleq.rs

@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::prelude::*;
+use core::prelude::*;
 
 use ast::{meta_item, item, expr};
 use codemap::span;

branches/snap-stage3/src/libsyntax/ext/deriving/cmp/totalord.rs

@@ -8,12 +8,14 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
+use core::prelude::*;
+
 use ast::{meta_item, item, expr};
 use codemap::span;
 use ext::base::ExtCtxt;
 use ext::build::AstBuilder;
 use ext::deriving::generic::*;
-use std::cmp::{Ordering, Equal, Less, Greater};
+use core::cmp::{Ordering, Equal, Less, Greater};
 
 pub fn expand_deriving_totalord(cx: @ExtCtxt,
                                 span: span,

branches/snap-stage3/src/libsyntax/ext/deriving/decodable.rs

@@ -13,8 +13,9 @@ The compiler code necessary for #[deriving(Decodable)]. See
 encodable.rs for more.
 */
 
-use std::vec;
-use std::uint;
+use core::prelude::*;
+use core::vec;
+use core::uint;
 
 use ast::{meta_item, item, expr, m_mutbl};
 use codemap::span;

branches/snap-stage3/src/libsyntax/ext/deriving/encodable.rs

@@ -75,6 +75,8 @@ would yield functions like:
     }
 */
 
+use core::prelude::*;
+
 use ast::{meta_item, item, expr, m_imm, m_mutbl};
 use codemap::span;
 use ext::base::ExtCtxt;