rustc: "import" -> "use"

9 files changed, 86 insertions, 86 deletions

diff --git a/src/rustc/metadata/creader.rs b/src/rustc/metadata/creader.rs
index 4f3df6cac70..df02a8640dc 100644
--- a/src/rustc/metadata/creader.rs
+++ b/src/rustc/metadata/creader.rs
@@ -1,16 +1,16 @@
 //! Validates all used crates and extern libraries and loads their metadata
 
-import syntax::diagnostic::span_handler;
-import syntax::{ast, ast_util};
-import syntax::attr;
-import syntax::visit;
-import syntax::codemap::span;
-import std::map::{hashmap, int_hash};
-import syntax::print::pprust;
-import filesearch::filesearch;
-import common::*;
-import dvec::DVec;
-import syntax::parse::token::ident_interner;
+use syntax::diagnostic::span_handler;
+use syntax::{ast, ast_util};
+use syntax::attr;
+use syntax::visit;
+use syntax::codemap::span;
+use std::map::{hashmap, int_hash};
+use syntax::print::pprust;
+use filesearch::filesearch;
+use common::*;
+use dvec::DVec;
+use syntax::parse::token::ident_interner;
 
 export read_crates;
 
diff --git a/src/rustc/metadata/csearch.rs b/src/rustc/metadata/csearch.rs
index 0c98541a363..69fc8b81b23 100644
--- a/src/rustc/metadata/csearch.rs
+++ b/src/rustc/metadata/csearch.rs
@@ -1,17 +1,17 @@
 // Searching for information from the cstore
 
-import std::{ebml};
-import syntax::ast;
-import syntax::ast_util;
-import syntax::ast_map;
-import middle::ty;
-import option::{Some, None};
-import syntax::diagnostic::span_handler;
-import syntax::diagnostic::expect;
-import ast_util::dummy_sp;
-import common::*;
-import std::map::hashmap;
-import dvec::DVec;
+use std::{ebml};
+use syntax::ast;
+use syntax::ast_util;
+use syntax::ast_map;
+use middle::ty;
+use option::{Some, None};
+use syntax::diagnostic::span_handler;
+use syntax::diagnostic::expect;
+use ast_util::dummy_sp;
+use common::*;
+use std::map::hashmap;
+use dvec::DVec;
 
 export class_dtor;
 export get_symbol;
diff --git a/src/rustc/metadata/cstore.rs b/src/rustc/metadata/cstore.rs
index 5664cf1bfa7..ce20569116d 100644
--- a/src/rustc/metadata/cstore.rs
+++ b/src/rustc/metadata/cstore.rs
@@ -1,11 +1,11 @@
 // The crate store - a central repo for information collected about external
 // crates and libraries
 
-import std::map;
-import std::map::hashmap;
-import syntax::{ast, attr};
-import syntax::ast_util::new_def_hash;
-import syntax::parse::token::ident_interner;
+use std::map;
+use std::map::hashmap;
+use syntax::{ast, attr};
+use syntax::ast_util::new_def_hash;
+use syntax::parse::token::ident_interner;
 
 export cstore;
 export cnum_map;
diff --git a/src/rustc/metadata/decoder.rs b/src/rustc/metadata/decoder.rs
index ee3abe1b089..d9ecc114062 100644
--- a/src/rustc/metadata/decoder.rs
+++ b/src/rustc/metadata/decoder.rs
@@ -1,21 +1,21 @@
 // Decoding metadata from a single crate's metadata
 
-import std::{ebml, map};
-import std::map::{hashmap, str_hash};
-import io::WriterUtil;
-import dvec::DVec;
-import syntax::{ast, ast_util};
-import syntax::attr;
-import middle::ty;
-import syntax::ast_map;
-import tydecode::{parse_ty_data, parse_def_id, parse_bounds_data,
+use std::{ebml, map};
+use std::map::{hashmap, str_hash};
+use io::WriterUtil;
+use dvec::DVec;
+use syntax::{ast, ast_util};
+use syntax::attr;
+use middle::ty;
+use syntax::ast_map;
+use tydecode::{parse_ty_data, parse_def_id, parse_bounds_data,
         parse_ident};
-import syntax::print::pprust;
-import cmd=cstore::crate_metadata;
-import util::ppaux::ty_to_str;
-import syntax::diagnostic::span_handler;
-import common::*;
-import syntax::parse::token::ident_interner;
+use syntax::print::pprust;
+use cmd=cstore::crate_metadata;
+use util::ppaux::ty_to_str;
+use syntax::diagnostic::span_handler;
+use common::*;
+use syntax::parse::token::ident_interner;
 
 
 export class_dtor;
diff --git a/src/rustc/metadata/encoder.rs b/src/rustc/metadata/encoder.rs
index a22b425c277..3d114ce4c6b 100644
--- a/src/rustc/metadata/encoder.rs
+++ b/src/rustc/metadata/encoder.rs
@@ -1,26 +1,26 @@
 // Metadata encoding
 
-import util::ppaux::ty_to_str;
-
-import std::{ebml, map};
-import std::map::hashmap;
-import io::WriterUtil;
-import ebml::Writer;
-import syntax::ast::*;
-import syntax::print::pprust;
-import syntax::{ast_util, visit};
-import syntax::ast_util::*;
-import common::*;
-import middle::ty;
-import middle::ty::node_id_to_type;
-import middle::resolve;
-import syntax::ast_map;
-import syntax::attr;
-import std::serialization::serializer;
-import std::ebml::serializer;
-import str::to_bytes;
-import syntax::ast;
-import syntax::diagnostic::span_handler;
+use util::ppaux::ty_to_str;
+
+use std::{ebml, map};
+use std::map::hashmap;
+use io::WriterUtil;
+use ebml::Writer;
+use syntax::ast::*;
+use syntax::print::pprust;
+use syntax::{ast_util, visit};
+use syntax::ast_util::*;
+use common::*;
+use middle::ty;
+use middle::ty::node_id_to_type;
+use middle::resolve;
+use syntax::ast_map;
+use syntax::attr;
+use std::serialization::serializer;
+use std::ebml::serializer;
+use str::to_bytes;
+use syntax::ast;
+use syntax::diagnostic::span_handler;
 
 export encode_parms;
 export encode_metadata;
diff --git a/src/rustc/metadata/filesearch.rs b/src/rustc/metadata/filesearch.rs
index c0639a7bb8a..26363806da0 100644
--- a/src/rustc/metadata/filesearch.rs
+++ b/src/rustc/metadata/filesearch.rs
@@ -2,7 +2,7 @@
 // FIXME (#2658): I'm not happy how this module turned out. Should
 // probably just be folded into cstore.
 
-import result::Result;
+use result::Result;
 export filesearch;
 export mk_filesearch;
 export pick;
diff --git a/src/rustc/metadata/loader.rs b/src/rustc/metadata/loader.rs
index 22eaa690295..c6f53377f1f 100644
--- a/src/rustc/metadata/loader.rs
+++ b/src/rustc/metadata/loader.rs
@@ -1,13 +1,13 @@
 //! Finds crate binaries and loads their metadata
 
-import syntax::diagnostic::span_handler;
-import syntax::{ast, attr};
-import syntax::print::pprust;
-import syntax::codemap::span;
-import lib::llvm::{False, llvm, mk_object_file, mk_section_iter};
-import filesearch::filesearch;
-import io::WriterUtil;
-import syntax::parse::token::ident_interner;
+use syntax::diagnostic::span_handler;
+use syntax::{ast, attr};
+use syntax::print::pprust;
+use syntax::codemap::span;
+use lib::llvm::{False, llvm, mk_object_file, mk_section_iter};
+use filesearch::filesearch;
+use io::WriterUtil;
+use syntax::parse::token::ident_interner;
 
 export os;
 export os_macos, os_win32, os_linux, os_freebsd;
diff --git a/src/rustc/metadata/tydecode.rs b/src/rustc/metadata/tydecode.rs
index 34676df489e..163bb5db81b 100644
--- a/src/rustc/metadata/tydecode.rs
+++ b/src/rustc/metadata/tydecode.rs
@@ -3,12 +3,12 @@
 // tjc note: Would be great to have a `match check` macro equivalent
 // for some of these
 
-import syntax::ast;
-import syntax::ast::*;
-import syntax::ast_util;
-import syntax::ast_util::respan;
-import middle::ty;
-import std::map::hashmap;
+use syntax::ast;
+use syntax::ast::*;
+use syntax::ast_util;
+use syntax::ast_util::respan;
+use middle::ty;
+use std::map::hashmap;
 
 export parse_ty_data, parse_def_id, parse_ident;
 export parse_bounds_data;
diff --git a/src/rustc/metadata/tyencode.rs b/src/rustc/metadata/tyencode.rs
index ed313238e68..42a258e836f 100644
--- a/src/rustc/metadata/tyencode.rs
+++ b/src/rustc/metadata/tyencode.rs
@@ -1,12 +1,12 @@
 // Type encoding
 
-import io::WriterUtil;
-import std::map::hashmap;
-import syntax::ast::*;
-import syntax::diagnostic::span_handler;
-import middle::ty;
-import middle::ty::vid;
-import syntax::print::pprust::*;
+use io::WriterUtil;
+use std::map::hashmap;
+use syntax::ast::*;
+use syntax::diagnostic::span_handler;
+use middle::ty;
+use middle::ty::vid;
+use syntax::print::pprust::*;
 
 export ctxt;
 export ty_abbrev;