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

2 files changed, 4 insertions, 6 deletions

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