From 8552a7477544b4bbf6ddd39e011a0e514cfd75d6 Mon Sep 17 00:00:00 2001
From: Alex Crichton <alex@alexcrichton.com>
Date: Sun, 30 Jun 2013 19:36:55 -0700
Subject: [PATCH] Bring compiletest/rustpkg/driver up to date on std vs core

---
 mk/tools.mk                      |  2 +-
 src/compiletest/common.rs        |  2 --
 src/compiletest/compiletest.rs   | 36 +++++++++++---------------------
 src/compiletest/errors.rs        |  4 +---
 src/compiletest/header.rs        |  6 ++----
 src/compiletest/procsrv.rs       |  8 +++----
 src/compiletest/runtest.rs       | 10 ++++-----
 src/compiletest/util.rs          |  6 ++----
 src/driver/driver.rs             |  5 -----
 src/librusti/rusti.rs            |  4 +++-
 src/librustpkg/api.rs            |  2 --
 src/librustpkg/messages.rs       |  1 -
 src/librustpkg/package_source.rs |  1 -
 src/librustpkg/util.rs           |  3 ++-
 14 files changed, 30 insertions(+), 60 deletions(-)

diff --git a/mk/tools.mk b/mk/tools.mk
index 0a901358ac1f0..0e83147501cbf 100644
--- a/mk/tools.mk
+++ b/mk/tools.mk
@@ -50,7 +50,7 @@ $$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTPKG_$(4)):		\
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_EXTRALIB_$(4))	\
 		$$(TLIB$(1)_T_$(4)_H_$(3))/$(CFG_LIBRUSTC_$(4))
 	@$$(call E, compile_and_link: $$@)
-	$$(STAGE$(1)_T_$(4)_H_$(3)) -o $$@ $$< && touch $$@
+	$$(STAGE$(1)_T_$(4)_H_$(3)) $$(WFLAGS_ST$(1)) -o $$@ $$< && touch $$@
 
 $$(TBIN$(1)_T_$(4)_H_$(3))/rustpkg$$(X_$(4)):				\
 		$$(DRIVER_CRATE) 							\
diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs
index 869657326b7d2..38289f6274180 100644
--- a/src/compiletest/common.rs
+++ b/src/compiletest/common.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 #[deriving(Eq)]
 pub enum mode {
     mode_compile_fail,
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 82206f12fae2e..7d9a7c3ea75dc 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -11,21 +11,16 @@
 #[crate_type = "bin"];
 
 #[allow(non_camel_case_types)];
+#[allow(unrecognized_lint)]; // NOTE: remove after snapshot
+#[deny(warnings)];
 
-#[no_core]; // XXX: Remove after snapshot
-#[no_std];
+extern mod extra;
 
-extern mod core(name = "std", vers = "0.7");
-extern mod extra(name = "extra", vers = "0.7");
-
-use core::prelude::*;
-use core::*;
+use std::os;
 
 use extra::getopts;
 use extra::test;
 
-use core::result::{Ok, Err};
-
 use common::config;
 use common::mode_run_pass;
 use common::mode_run_fail;
@@ -42,13 +37,6 @@ pub mod runtest;
 pub mod common;
 pub mod errors;
 
-mod std {
-    pub use core::cmp;
-    pub use core::str;
-    pub use core::sys;
-    pub use core::unstable;
-}
-
 pub fn main() {
     let args = os::args();
     let config = parse_config(args);
@@ -98,8 +86,8 @@ pub fn parse_config(args: ~[~str]) -> config {
         run_ignored: getopts::opt_present(matches, "ignored"),
         filter:
              if !matches.free.is_empty() {
-                 option::Some(copy matches.free[0])
-             } else { option::None },
+                 Some(copy matches.free[0])
+             } else { None },
         logfile: getopts::opt_maybe_str(matches, "logfile").map(|s| Path(*s)),
         runtool: getopts::opt_maybe_str(matches, "runtool"),
         rustcflags: getopts::opt_maybe_str(matches, "rustcflags"),
@@ -148,8 +136,8 @@ pub fn log_config(config: &config) {
 
 pub fn opt_str<'a>(maybestr: &'a Option<~str>) -> &'a str {
     match *maybestr {
-        option::None => "(none)",
-        option::Some(ref s) => {
+        None => "(none)",
+        Some(ref s) => {
             let s: &'a str = *s;
             s
         }
@@ -161,7 +149,7 @@ pub fn opt_str2(maybestr: Option<~str>) -> ~str {
 }
 
 pub fn str_opt(maybestr: ~str) -> Option<~str> {
-    if maybestr != ~"(none)" { option::Some(maybestr) } else { option::None }
+    if maybestr != ~"(none)" { Some(maybestr) } else { None }
 }
 
 pub fn str_mode(s: ~str) -> mode {
@@ -199,8 +187,8 @@ pub fn test_opts(config: &config) -> test::TestOpts {
         logfile: copy config.logfile,
         run_tests: true,
         run_benchmarks: false,
-        save_results: option::None,
-        compare_results: option::None
+        save_results: None,
+        compare_results: None
     }
 }
 
@@ -268,7 +256,7 @@ pub fn make_test_name(config: &config, testfile: &Path) -> test::TestName {
 }
 
 pub fn make_test_closure(config: &config, testfile: &Path) -> test::TestFn {
-    use core::cell::Cell;
+    use std::cell::Cell;
     let config = Cell::new(copy *config);
     let testfile = Cell::new(testfile.to_str());
     test::DynTestFn(|| { runtest::run(config.take(), testfile.take()) })
diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs
index 4649d4dfc3c4b..780a917c019b2 100644
--- a/src/compiletest/errors.rs
+++ b/src/compiletest/errors.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::io;
+use std::io;
 
 pub struct ExpectedError { line: uint, kind: ~str, msg: ~str }
 
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index ddb68d481167a..9cd489f05766a 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -8,13 +8,11 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use common::config;
 use common;
 
-use core::io;
-use core::os;
+use std::io;
+use std::os;
 
 pub struct TestProps {
     // Lines that should be expected, in order, on standard out
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index 93fe258d167ed..0e61b45d6199f 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -8,11 +8,9 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
-use core::os;
-use core::run;
-use core::str;
+use std::os;
+use std::run;
+use std::str;
 
 #[cfg(target_os = "win32")]
 fn target_env(lib_path: &str, prog: &str) -> ~[(~str,~str)] {
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 8e493fd5396f9..91016ba91fa55 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -8,8 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use common::mode_run_pass;
 use common::mode_run_fail;
 use common::mode_compile_fail;
@@ -22,10 +20,10 @@ use procsrv;
 use util;
 use util::logv;
 
-use core::io;
-use core::os;
-use core::uint;
-use core::vec;
+use std::io;
+use std::os;
+use std::uint;
+use std::vec;
 
 pub fn run(config: config, testfile: ~str) {
     if config.verbose {
diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs
index 26a62f8a5b224..5af469ff8417c 100644
--- a/src/compiletest/util.rs
+++ b/src/compiletest/util.rs
@@ -8,12 +8,10 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use core::prelude::*;
-
 use common::config;
 
-use core::io;
-use core::os::getenv;
+use std::io;
+use std::os::getenv;
 
 pub fn make_new_path(path: &str) -> ~str {
 
diff --git a/src/driver/driver.rs b/src/driver/driver.rs
index 0f61ede4fc59d..e81a3230e1343 100644
--- a/src/driver/driver.rs
+++ b/src/driver/driver.rs
@@ -8,11 +8,6 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-#[no_core];
-#[no_std];
-
-extern mod core(name = "std", vers = "0.7");
-
 #[cfg(rustpkg)]
 extern mod this(name = "rustpkg");
 
diff --git a/src/librusti/rusti.rs b/src/librusti/rusti.rs
index bdbbcfc2b665e..9911ca699dac0 100644
--- a/src/librusti/rusti.rs
+++ b/src/librusti/rusti.rs
@@ -667,8 +667,10 @@ mod tests {
             fn f() {}
             f()
         ");
+    }
 
-        debug!("simultaneous definitions + expressions are allowed");
+    #[test]
+    fn simultaneous_definition_and_expression() {
         run_program("
             let a = 3; a as u8
         ");
diff --git a/src/librustpkg/api.rs b/src/librustpkg/api.rs
index c36c6390a759f..5233b87f7e4fa 100644
--- a/src/librustpkg/api.rs
+++ b/src/librustpkg/api.rs
@@ -14,10 +14,8 @@ use package_id::*;
 use package_source::*;
 use version::Version;
 
-use std::option::*;
 use std::os;
 use std::hashmap::*;
-use std::path::*;
 
 /// Convenience functions intended for calling from pkg.rs
 
diff --git a/src/librustpkg/messages.rs b/src/librustpkg/messages.rs
index eec33a375355e..96c99a7a0f17e 100644
--- a/src/librustpkg/messages.rs
+++ b/src/librustpkg/messages.rs
@@ -10,7 +10,6 @@
 
 use extra::term;
 use std::io;
-use std::result::*;
 
 pub fn note(msg: &str) {
     pretty_message(msg, "note: ", term::color::GREEN, io::stdout())
diff --git a/src/librustpkg/package_source.rs b/src/librustpkg/package_source.rs
index 24c1bb9b200f4..b2f608bd352ae 100644
--- a/src/librustpkg/package_source.rs
+++ b/src/librustpkg/package_source.rs
@@ -11,7 +11,6 @@
 use target::*;
 use package_id::PkgId;
 use std::path::Path;
-use std::option::*;
 use std::{os, run, str};
 use context::*;
 use crate::Crate;
diff --git a/src/librustpkg/util.rs b/src/librustpkg/util.rs
index 1e99a3fa4bcda..8a57cd4b25c0e 100644
--- a/src/librustpkg/util.rs
+++ b/src/librustpkg/util.rs
@@ -8,7 +8,7 @@
 // option. This file may not be copied, modified, or distributed
 // except according to those terms.
 
-use std::{libc, os, result, str};
+use std::{os, result};
 use rustc::driver::{driver, session};
 use rustc::metadata::filesearch;
 use extra::getopts::groups::getopts;
@@ -379,6 +379,7 @@ pub fn link_exe(_src: &Path, _dest: &Path) -> bool {
 #[cfg(target_os = "freebsd")]
 #[cfg(target_os = "macos")]
 pub fn link_exe(src: &Path, dest: &Path) -> bool {
+    use std::{libc, str};
     unsafe {
         do str::as_c_str(src.to_str()) |src_buf| {
             do str::as_c_str(dest.to_str()) |dest_buf| {