Convert 'import' to 'use'. Remove 'import' keyword.

8 files changed, 33 insertions, 43 deletions

diff --git a/src/compiletest/common.rs b/src/compiletest/common.rs
index 5a8b98cd857..a9f50492f2b 100644
--- a/src/compiletest/common.rs
+++ b/src/compiletest/common.rs
@@ -1,5 +1,3 @@
-import option;
-
 enum mode { mode_compile_fail, mode_run_fail, mode_run_pass, mode_pretty, }
 
 impl mode : cmp::Eq {
diff --git a/src/compiletest/compiletest.rc b/src/compiletest/compiletest.rc
index 685f2009e26..201edcb0f26 100644
--- a/src/compiletest/compiletest.rc
+++ b/src/compiletest/compiletest.rc
@@ -7,7 +7,7 @@
 use core(vers = "0.4");
 use std(vers = "0.4");
 
-import core::*;
+use core::*;
 
 mod procsrv;
 mod util;
diff --git a/src/compiletest/compiletest.rs b/src/compiletest/compiletest.rs
index 121cf9df669..4b24c5fd295 100644
--- a/src/compiletest/compiletest.rs
+++ b/src/compiletest/compiletest.rs
@@ -1,20 +1,16 @@
-import option;
-import std::getopts;
-import std::test;
-import str;
-import vec;
-import task;
-
-import core::result;
-import result::{Ok, Err};
-
-import common::config;
-import common::mode_run_pass;
-import common::mode_run_fail;
-import common::mode_compile_fail;
-import common::mode_pretty;
-import common::mode;
-import util::logv;
+use std::getopts;
+use std::test;
+
+use core::result;
+use result::{Ok, Err};
+
+use common::config;
+use common::mode_run_pass;
+use common::mode_run_fail;
+use common::mode_compile_fail;
+use common::mode_pretty;
+use common::mode;
+use util::logv;
 
 fn main(args: ~[~str]) {
     let config = parse_config(args);
diff --git a/src/compiletest/errors.rs b/src/compiletest/errors.rs
index d321cde3142..e7d6593061d 100644
--- a/src/compiletest/errors.rs
+++ b/src/compiletest/errors.rs
@@ -1,5 +1,5 @@
-import common::config;
-import io::ReaderUtil;
+use common::config;
+use io::ReaderUtil;
 
 export load_errors;
 export expected_error;
diff --git a/src/compiletest/header.rs b/src/compiletest/header.rs
index 0458d86f466..521b603f1b4 100644
--- a/src/compiletest/header.rs
+++ b/src/compiletest/header.rs
@@ -1,8 +1,5 @@
-import option;
-import str;
-
-import common::config;
-import io::ReaderUtil;
+use common::config;
+use io::ReaderUtil;
 
 export test_props;
 export load_props;
diff --git a/src/compiletest/procsrv.rs b/src/compiletest/procsrv.rs
index 1ab3bc55d9f..90f88ea9d7a 100644
--- a/src/compiletest/procsrv.rs
+++ b/src/compiletest/procsrv.rs
@@ -1,6 +1,6 @@
-import run::spawn_process;
-import io::{ReaderUtil, WriterUtil};
-import libc::{c_int, pid_t};
+use run::spawn_process;
+use io::{ReaderUtil, WriterUtil};
+use libc::{c_int, pid_t};
 
 export run;
 
diff --git a/src/compiletest/runtest.rs b/src/compiletest/runtest.rs
index 65835e9b470..55f17c245dc 100644
--- a/src/compiletest/runtest.rs
+++ b/src/compiletest/runtest.rs
@@ -1,13 +1,13 @@
-import io::WriterUtil;
-
-import common::mode_run_pass;
-import common::mode_run_fail;
-import common::mode_compile_fail;
-import common::mode_pretty;
-import common::config;
-import header::load_props;
-import header::test_props;
-import util::logv;
+use io::WriterUtil;
+
+use common::mode_run_pass;
+use common::mode_run_fail;
+use common::mode_compile_fail;
+use common::mode_pretty;
+use common::config;
+use header::load_props;
+use header::test_props;
+use util::logv;
 
 export run;
 
diff --git a/src/compiletest/util.rs b/src/compiletest/util.rs
index 30ba4c0a343..ac0b4b03596 100644
--- a/src/compiletest/util.rs
+++ b/src/compiletest/util.rs
@@ -1,7 +1,6 @@
-import option;
-import os::getenv;
+use os::getenv;
 
-import common::config;
+use common::config;
 
 fn make_new_path(path: ~str) -> ~str {