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

Author: brson

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 {

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;

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

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;

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;

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;
 

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;
 

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 {
 

src/libcore/core.rc

@@ -75,7 +75,7 @@ export priv;
 /// Operations and constants for `int`
 #[path = "int-template"]
 mod int {
-    import inst::{ hash, pow };
+    use inst::{ hash, pow };
     export hash, pow;
     #[path = "int.rs"]
     mod inst;
@@ -112,7 +112,7 @@ mod i64 {
 /// Operations and constants for `uint`
 #[path = "uint-template"]
 mod uint {
-    import inst::{
+    use inst::{
         div_ceil, div_round, div_floor, hash, iterate,
         next_power_of_two
     };
@@ -126,7 +126,7 @@ mod uint {
 /// Operations and constants for `u8`
 #[path = "uint-template"]
 mod u8 {
-    import inst::is_ascii;
+    use inst::is_ascii;
     export is_ascii;
 
     #[path = "u8.rs"]

src/libcore/core.rs

@@ -97,7 +97,7 @@ mod core {
 #[cfg(test)]
 mod std {
     use std(vers = "0.4");
-    import std::test;
+    use std::test;
 }
 
 /**

src/libcore/gc.rs

@@ -25,10 +25,10 @@ with destructors.
 
 */
 
-import stackwalk::Word;
-import libc::size_t;
-import libc::uintptr_t;
-import send_map::linear::LinearMap;
+use stackwalk::Word;
+use libc::size_t;
+use libc::uintptr_t;
+use send_map::linear::LinearMap;
 
 export Word;
 export gc;

src/libcore/int-template.rs

@@ -210,7 +210,7 @@ fn test_from_str() {
 #[test]
 #[ignore]
 fn test_parse_buf() {
-    import str::to_bytes;
+    use str::to_bytes;
     assert parse_buf(to_bytes(~"123"), 10u) == Some(123 as T);
     assert parse_buf(to_bytes(~"1001"), 2u) == Some(9 as T);
     assert parse_buf(to_bytes(~"123"), 8u) == Some(83 as T);
@@ -263,7 +263,7 @@ fn test_interfaces() {
 
 #[test]
 fn test_times() {
-    import iter::Times;
+    use iter::Times;
     let ten = 10 as T;
     let mut accum = 0;
     for ten.times { accum += 1; }
@@ -274,6 +274,6 @@ fn test_times() {
 #[should_fail]
 #[ignore(cfg(windows))]
 fn test_times_negative() {
-    import iter::Times;
+    use iter::Times;
     for (-10).times { log(error, ~"nope!"); }
 }

src/libcore/libc.rs

@@ -1143,7 +1143,7 @@ mod funcs {
 
     #[cfg(target_os = "win32")]
     mod extra {
-        import types::os::arch::extra::*;
+        use types::os::arch::extra::*;
 
         #[abi = "stdcall"]
         extern mod kernel32 {