librustc: Stop reexporting the standard modules from prelude.

4 files changed, 21 insertions, 7 deletions

diff --git a/src/librustpkg/path_util.rs b/src/librustpkg/path_util.rs
index 700b3338a3a..2fca0419629 100644
--- a/src/librustpkg/path_util.rs
+++ b/src/librustpkg/path_util.rs
@@ -11,10 +11,12 @@
 // rustpkg utilities having to do with paths and directories
 
 use core::prelude::*;
+
 pub use util::{PkgId, RemotePath, LocalPath};
+pub use util::{normalize, OutputType, Main, Lib, Bench, Test};
 use core::libc::consts::os::posix88::{S_IRUSR, S_IWUSR, S_IXUSR};
 use core::os::mkdir_recursive;
-pub use util::{normalize, OutputType, Main, Lib, Bench, Test};
+use core::os;
 
 /// Returns the value of RUST_PATH, as a list
 /// of Paths. In general this should be read from the
diff --git a/src/librustpkg/rustpkg.rc b/src/librustpkg/rustpkg.rc
index ae4bfc6bc4b..6b560541e52 100644
--- a/src/librustpkg/rustpkg.rc
+++ b/src/librustpkg/rustpkg.rc
@@ -21,7 +21,7 @@
 #[no_std];
 
 extern mod core(name = "std");
-extern mod std(name = "extra");
+extern mod extra(name = "extra");
 
 extern mod rustc;
 extern mod syntax;
@@ -32,7 +32,7 @@ pub use core::path::Path;
 use core::hashmap::HashMap;
 use rustc::driver::{driver, session};
 use rustc::metadata::filesearch;
-use std::{getopts};
+use extra::{getopts};
 use syntax::{ast, diagnostic};
 use util::*;
 use path_util::{build_pkg_id_in_workspace, pkgid_src_in_workspace, u_rwx};
@@ -51,6 +51,15 @@ mod workspace;
 
 pub mod usage;
 
+mod std {
+    pub use core::cmp;
+    pub use core::condition;
+    pub use core::os;
+    pub use core::str;
+    pub use core::sys;
+    pub use core::unstable;
+}
+
 /// A PkgScript represents user-supplied custom logic for
 /// special build hooks. This only exists for packages with
 /// an explicit package script.
diff --git a/src/librustpkg/tests.rs b/src/librustpkg/tests.rs
index 6a69eb71eaf..9499430ef4c 100644
--- a/src/librustpkg/tests.rs
+++ b/src/librustpkg/tests.rs
@@ -12,8 +12,11 @@
 
 use context::Ctx;
 use core::hashmap::HashMap;
+use core::io;
+use core::os;
 use core::prelude::*;
-use std::tempfile::mkdtemp;
+use core::result;
+use extra::tempfile::mkdtemp;
 use util::{PkgId, default_version};
 use path_util::{target_executable_in_workspace, target_library_in_workspace,
                target_test_in_workspace, target_bench_in_workspace,
diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
index 80533b2d3b1..8019b3b8afb 100644
--- a/src/librustpkg/util.rs
+++ b/src/librustpkg/util.rs
@@ -15,9 +15,9 @@ use core::hash::Streaming;
 use core::rt::io::Writer;
 use rustc::driver::{driver, session};
 use rustc::metadata::filesearch;
-use std::getopts::groups::getopts;
-use std::semver;
-use std::term;
+use extra::getopts::groups::getopts;
+use extra::semver;
+use extra::term;
 use syntax::ast_util::*;
 use syntax::codemap::{dummy_sp, spanned, dummy_spanned};
 use syntax::ext::base::ExtCtxt;