librustc: Change `std` to `extra` throughout libsyntax and librustc

12 files changed, 29 insertions, 27 deletions

diff --git a/src/libsyntax/ast.rs b/src/libsyntax/ast.rs
index f82d8d3798a..e5771a5db2e 100644
--- a/src/libsyntax/ast.rs
+++ b/src/libsyntax/ast.rs
@@ -18,12 +18,12 @@ use opt_vec::OptVec;
 use parse::token::get_ident_interner;
 
 use core::cast;
+use core::hashmap::HashMap;
 use core::option::{Option};
-use core::to_bytes;
 use core::to_bytes::IterBytes;
+use core::to_bytes;
 use core::to_str::ToStr;
-use core::hashmap::HashMap;
-use std::serialize::{Encodable, Decodable, Encoder, Decoder};
+use extra::serialize::{Encodable, Decodable, Encoder, Decoder};
 
 
 // an identifier contains an index into the interner
@@ -1117,7 +1117,7 @@ pub enum inlined_item {
 mod test {
     use core::option::{None, Option, Some};
     use core::uint;
-    use std;
+    use extra;
     use codemap::*;
     use super::*;
 
@@ -1206,7 +1206,7 @@ mod test {
             },
             span: bogus_span};
         // doesn't matter which encoder we use....
-        let _f = (@e as @std::serialize::Encodable<std::json::Encoder>);
+        let _f = (@e as @extra::serialize::Encodable<extra::json::Encoder>);
     }
 
 
diff --git a/src/libsyntax/attr.rs b/src/libsyntax/attr.rs
index 4ac4aeed63a..6ac743d3844 100644
--- a/src/libsyntax/attr.rs
+++ b/src/libsyntax/attr.rs
@@ -20,7 +20,7 @@ use diagnostic::span_handler;
 use parse::comments::{doc_comment_style, strip_doc_comment_decoration};
 
 use core::hashmap::HashSet;
-use std;
+use extra;
 
 /* Constructors */
 
@@ -258,7 +258,7 @@ pub fn last_meta_item_list_by_name(items: ~[@ast::meta_item], name: &str)
 pub fn sort_meta_items(items: &[@ast::meta_item]) -> ~[@ast::meta_item] {
     // This is sort of stupid here, converting to a vec of mutables and back
     let mut v = vec::to_owned(items);
-    do std::sort::quick_sort(v) |ma, mb| {
+    do extra::sort::quick_sort(v) |ma, mb| {
         get_meta_item_name(*ma) <= get_meta_item_name(*mb)
     }
 
diff --git a/src/libsyntax/codemap.rs b/src/libsyntax/codemap.rs
index 5f701c4be8b..77a6137cd17 100644
--- a/src/libsyntax/codemap.rs
+++ b/src/libsyntax/codemap.rs
@@ -24,7 +24,7 @@ source code snippets, etc.
 use core::prelude::*;
 
 use core::to_bytes;
-use std::serialize::{Encodable, Decodable, Encoder, Decoder};
+use extra::serialize::{Encodable, Decodable, Encoder, Decoder};
 
 pub trait Pos {
     fn from_uint(n: uint) -> Self;
diff --git a/src/libsyntax/diagnostic.rs b/src/libsyntax/diagnostic.rs
index 528bc546fa3..792b561f110 100644
--- a/src/libsyntax/diagnostic.rs
+++ b/src/libsyntax/diagnostic.rs
@@ -13,7 +13,7 @@ use core::prelude::*;
 use codemap::{Pos, span};
 use codemap;
 
-use std::term;
+use extra::term;
 
 pub type Emitter = @fn(cmsp: Option<(@codemap::CodeMap, span)>,
                        msg: &str,
diff --git a/src/libsyntax/ext/deriving/decodable.rs b/src/libsyntax/ext/deriving/decodable.rs
index f3ea6f28a00..d1f1c4187d5 100644
--- a/src/libsyntax/ext/deriving/decodable.rs
+++ b/src/libsyntax/ext/deriving/decodable.rs
@@ -53,7 +53,7 @@ fn create_derived_decodable_impl(
                 cx.path_global(
                     span,
                     ~[
-                        cx.ident_of("std"),
+                        cx.ident_of("extra"),
                         cx.ident_of("serialize"),
                         cx.ident_of("Decoder"),
                     ]))));
@@ -66,7 +66,7 @@ fn create_derived_decodable_impl(
         span,
         true,
         ~[
-            cx.ident_of("std"),
+            cx.ident_of("extra"),
             cx.ident_of("serialize"),
             cx.ident_of("Decodable")
         ],
@@ -150,7 +150,7 @@ fn call_substructure_decode_method(
             cx.path_global(
                 span,
                 ~[
-                    cx.ident_of("std"),
+                    cx.ident_of("extra"),
                     cx.ident_of("serialize"),
                     cx.ident_of("Decodable"),
                     cx.ident_of("decode"),
diff --git a/src/libsyntax/ext/deriving/encodable.rs b/src/libsyntax/ext/deriving/encodable.rs
index 00f7b7a1ebd..6ca7d0b7b28 100644
--- a/src/libsyntax/ext/deriving/encodable.rs
+++ b/src/libsyntax/ext/deriving/encodable.rs
@@ -22,7 +22,7 @@ For example, a type like:
 
 would generate two implementations like:
 
-impl<S:std::serialize::Encoder> Encodable<S> for Node {
+impl<S:extra::serialize::Encoder> Encodable<S> for Node {
     fn encode(&self, s: &S) {
         do s.emit_struct("Node", 1) {
             s.emit_field("id", 0, || s.emit_uint(self.id))
@@ -115,7 +115,7 @@ fn create_derived_encodable_impl(
                 cx.path_global(
                     span,
                     ~[
-                        cx.ident_of("std"),
+                        cx.ident_of("extra"),
                         cx.ident_of("serialize"),
                         cx.ident_of("Encoder"),
                     ]))));
@@ -128,7 +128,7 @@ fn create_derived_encodable_impl(
         span,
         true,
         ~[
-            cx.ident_of("std"),
+            cx.ident_of("extra"),
             cx.ident_of("serialize"),
             cx.ident_of("Encodable")
         ],
@@ -411,10 +411,10 @@ fn expand_deriving_encodable_enum_method(
 
 #[cfg(test)]
 mod test {
-    extern mod std;
+    extern mod extra;
     use core::option::{None, Some};
-    use std::serialize::Encodable;
-    use std::serialize::Encoder;
+    use extra::serialize::Encodable;
+    use extra::serialize::Encoder;
 
     // just adding the ones I want to test, for now:
     #[deriving(Eq)]
diff --git a/src/libsyntax/ext/deriving/generic.rs b/src/libsyntax/ext/deriving/generic.rs
index 49f7ea59864..e250f970e62 100644
--- a/src/libsyntax/ext/deriving/generic.rs
+++ b/src/libsyntax/ext/deriving/generic.rs
@@ -202,7 +202,7 @@ pub struct TraitDef<'self> {
     /// other than the current trait
     additional_bounds: ~[Ty<'self>],
 
-    /// Any extra lifetimes and/or bounds, e.g. `D: std::serialize::Decoder`
+    /// Any extra lifetimes and/or bounds, e.g. `D: extra::serialize::Decoder`
     generics: LifetimeBounds<'self>,
 
     methods: ~[MethodDef<'self>]
diff --git a/src/libsyntax/ext/deriving/mod.rs b/src/libsyntax/ext/deriving/mod.rs
index e96682676bd..63ef8716149 100644
--- a/src/libsyntax/ext/deriving/mod.rs
+++ b/src/libsyntax/ext/deriving/mod.rs
@@ -13,7 +13,7 @@ The compiler code necessary to implement the #[deriving] extensions.
 
 
 FIXME (#2810)--Hygiene. Search for "__" strings (in other files too).
-We also assume "std" is the standard library, and "core" is the core
+We also assume "extra" is the standard library, and "core" is the core
 library.
 
 */
diff --git a/src/libsyntax/ext/pipes/liveness.rs b/src/libsyntax/ext/pipes/liveness.rs
index 9cdd35aaf32..f1f5a7f12b2 100644
--- a/src/libsyntax/ext/pipes/liveness.rs
+++ b/src/libsyntax/ext/pipes/liveness.rs
@@ -42,7 +42,7 @@ use core::prelude::*;
 use ext::base::ExtCtxt;
 use ext::pipes::proto::{protocol_};
 
-use std::bitv::Bitv;
+use extra::bitv::Bitv;
 
 pub fn analyze(proto: @mut protocol_, _cx: @ExtCtxt) {
     debug!("initializing colive analysis");
diff --git a/src/libsyntax/parse/lexer.rs b/src/libsyntax/parse/lexer.rs
index 86284a3923a..77637712c7f 100644
--- a/src/libsyntax/parse/lexer.rs
+++ b/src/libsyntax/parse/lexer.rs
@@ -20,8 +20,6 @@ use parse::token;
 
 pub use ext::tt::transcribe::{TtReader, new_tt_reader};
 
-//use std;
-
 pub trait reader {
     fn is_eof(@mut self) -> bool;
     fn next_token(@mut self) -> TokenAndSpan;
diff --git a/src/libsyntax/parse/mod.rs b/src/libsyntax/parse/mod.rs
index 8eb7ca2923c..eca999231cd 100644
--- a/src/libsyntax/parse/mod.rs
+++ b/src/libsyntax/parse/mod.rs
@@ -343,8 +343,8 @@ pub fn maybe_aborted<T>(result : T, p: Parser) -> T {
 #[cfg(test)]
 mod test {
     use super::*;
-    use std::serialize::Encodable;
-    use std;
+    use extra::serialize::Encodable;
+    use extra;
     use core::io;
     use core::option::Some;
     use core::option::None;
@@ -365,9 +365,9 @@ mod test {
     }
 
 
-    #[cfg(test)] fn to_json_str<E : Encodable<std::json::Encoder>>(val: @E) -> ~str {
+    #[cfg(test)] fn to_json_str<E : Encodable<extra::json::Encoder>>(val: @E) -> ~str {
         do io::with_str_writer |writer| {
-            let mut encoder = std::json::Encoder(writer);
+            let mut encoder = extra::json::Encoder(writer);
             val.encode(&mut encoder);
         }
     }
diff --git a/src/libsyntax/syntax.rc b/src/libsyntax/syntax.rc
index 1b9b7b2c8c3..8ec281a6bc1 100644
--- a/src/libsyntax/syntax.rc
+++ b/src/libsyntax/syntax.rc
@@ -27,6 +27,10 @@
 #[no_std];
 
 extern mod core(name = "std");
+extern mod extra(name = "extra");
+
+// For deriving(Encodable) purposes...
+#[cfg(stage0)]
 extern mod std(name = "extra");
 
 use core::prelude::*;