---

yaml
---
r: 63675
b: refs/heads/snap-stage3
c: 0d471d3
h: refs/heads/master
i:
  63673: d8df1f8
  63671: 4f1ff48
v: v3

Author: emberian

[refs]

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

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

@@ -101,14 +101,6 @@ pub enum Namespace {
     ValueNS
 }
 
-#[deriving(Eq)]
-pub enum NamespaceError {
-    NoError,
-    ModuleError,
-    TypeError,
-    ValueError
-}
-
 /// A NamespaceResult represents the result of resolving an import in
 /// a particular namespace. The result is either definitely-resolved,
 /// definitely- unresolved, or unknown.
@@ -767,12 +759,10 @@ pub fn PrimitiveTypeTable() -> PrimitiveTypeTable {
 }
 
 
-pub fn namespace_error_to_str(ns: NamespaceError) -> &'static str {
+pub fn namespace_to_str(ns: Namespace) -> ~str {
     match ns {
-        NoError     => "",
-        ModuleError => "module",
-        TypeError   => "type",
-        ValueError  => "value",
+        TypeNS  => ~"type",
+        ValueNS => ~"value",
     }
 }
 
@@ -1003,25 +993,21 @@ impl Resolver {
                 // * If no duplicate checking was requested at all, do
                 //   nothing.
 
-                let mut duplicate_type = NoError;
+                let mut is_duplicate = false;
                 let ns = match duplicate_checking_mode {
                     ForbidDuplicateModules => {
-                        if (child.get_module_if_available().is_some()) {
-                            duplicate_type = ModuleError;
-                        }
+                        is_duplicate = child.get_module_if_available().is_some();
                         Some(TypeNS)
                     }
                     ForbidDuplicateTypes => {
                         match child.def_for_namespace(TypeNS) {
                             Some(def_mod(_)) | None => {}
-                            Some(_) => duplicate_type = TypeError
+                            Some(_) => is_duplicate = true
                         }
                         Some(TypeNS)
                     }
                     ForbidDuplicateValues => {
-                        if child.defined_in_namespace(ValueNS) {
-                            duplicate_type = ValueError;
-                        }
+                        is_duplicate = child.defined_in_namespace(ValueNS);
                         Some(ValueNS)
                     }
                     ForbidDuplicateTypesAndValues => {
@@ -1030,31 +1016,31 @@ impl Resolver {
                             Some(def_mod(_)) | None => {}
                             Some(_) => {
                                 n = Some(TypeNS);
-                                duplicate_type = TypeError;
+                                is_duplicate = true;
                             }
                         };
                         if child.defined_in_namespace(ValueNS) {
-                            duplicate_type = ValueError;
+                            is_duplicate = true;
                             n = Some(ValueNS);
                         }
                         n
                     }
                     OverwriteDuplicates => None
                 };
-                if (duplicate_type != NoError) {
+                if is_duplicate {
                     // Return an error here by looking up the namespace that
                     // had the duplicate.
                     let ns = ns.unwrap();
                     self.session.span_err(sp,
                         fmt!("duplicate definition of %s `%s`",
-                             namespace_error_to_str(duplicate_type),
+                             namespace_to_str(ns),
                              self.session.str_of(name)));
                     {
                         let r = child.span_for_namespace(ns);
                         for r.iter().advance |sp| {
                             self.session.span_note(*sp,
-                                 fmt!("first definition of %s `%s` here",
-                                      namespace_error_to_str(duplicate_type),
+                                 fmt!("first definition of %s %s here:",
+                                      namespace_to_str(ns),
                                       self.session.str_of(name)));
                         }
                     }

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

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

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

@@ -10,18 +10,16 @@
 
 // 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 core::hashmap::HashMap;
-use core::option::Option;
-use core::to_bytes::IterBytes;
-use core::to_bytes;
-use core::to_str::ToStr;
+use std::hashmap::HashMap;
+use std::option::Option;
+use std::to_bytes::IterBytes;
+use std::to_bytes;
+use std::to_str::ToStr;
 use extra::serialize::{Encodable, Decodable, Encoder, Decoder};
 
 

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

@@ -8,8 +8,6 @@
 // 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;
@@ -22,9 +20,9 @@ use print::pprust;
 use visit;
 use syntax::parse::token::special_idents;
 
-use core::cmp;
-use core::hashmap::HashMap;
-use core::vec;
+use std::cmp;
+use std::hashmap::HashMap;
+use std::vec;
 
 pub enum path_elt {
     path_mod(ident),

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

@@ -8,22 +8,20 @@
 // 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 core::hashmap::HashMap;
-use core::int;
-use core::option;
-use core::to_bytes;
+use std::hashmap::HashMap;
+use std::int;
+use std::option;
+use std::to_bytes;
+use std::cast;
+use std::local_data;
 
 pub fn path_name_i(idents: &[ident]) -> ~str {
     // FIXME: Bad copies (#2543 -- same for everything else that says "bad")
@@ -793,7 +791,7 @@ pub fn getLast(arr: &~[Mrk]) -> uint {
 mod test {
     use ast::*;
     use super::*;
-    use core::io;
+    use std::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
 
-use core::prelude::*;
+extern mod extra;
 
 use ast;
 use codemap::{spanned, dummy_spanned};
@@ -19,10 +19,8 @@ use codemap::BytePos;
 use diagnostic::span_handler;
 use parse::comments::{doc_comment_style, strip_doc_comment_decoration};
 
-use core::hashmap::HashSet;
-use core::vec;
-use extra;
-
+use std::hashmap::HashSet;
+use std::vec;
 /* Constructors */
 
 pub fn mk_name_value_item_str(name: @str, value: @str)

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

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

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

@@ -8,14 +8,12 @@
 // 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 core::io;
-use core::uint;
-use core::vec;
+use std::io;
+use std::uint;
+use std::vec;
 use extra::term;
 
 pub type Emitter = @fn(cmsp: Option<(@codemap::CodeMap, span)>,

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

@@ -12,16 +12,15 @@
  * 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,9 +8,6 @@
 // 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;
@@ -22,7 +19,8 @@ use parse;
 use parse::token;
 use parse::token::{ident_to_str, intern, str_to_ident};
 
-use core::hashmap::HashMap;
+use std::vec;
+use std::hashmap::HashMap;
 
 // new-style macro! tt code:
 //
@@ -535,7 +533,7 @@ fn satisfies_pred<K : Eq + Hash + IterBytes,V>(map : &mut HashMap<K,V>,
 #[cfg(test)]
 mod test {
     use super::MapChain;
-    use core::hashmap::HashMap;
+    use std::hashmap::HashMap;
 
     #[test] fn testenv () {
         let mut a = HashMap::new();

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

@@ -8,8 +8,6 @@
 // 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,8 +8,6 @@
 // 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,8 +8,6 @@
 // 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,8 +8,6 @@
 // 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,8 +8,6 @@
 // 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 core::prelude::*;
+use std::prelude::*;
 
 use ast::{meta_item, item, expr};
 use codemap::span;

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

@@ -8,14 +8,12 @@
 // 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 core::cmp::{Ordering, Equal, Less, Greater};
+use std::cmp::{Ordering, Equal, Less, Greater};
 
 pub fn expand_deriving_totalord(cx: @ExtCtxt,
                                 span: span,

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

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

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

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