Remove some pointless imports

65 files changed, 12 insertions, 134 deletions

diff --git a/src/comp/back/link.rs b/src/comp/back/link.rs
index 714ed3c865a..cb2070c124c 100644
--- a/src/comp/back/link.rs
+++ b/src/comp/back/link.rs
@@ -1,4 +1,4 @@
-import core::ctypes::{c_int, c_uint};
+import ctypes::{c_int, c_uint};
 import driver::session;
 import session::session;
 import lib::llvm::llvm;
@@ -6,13 +6,8 @@ import front::attr;
 import middle::ty;
 import metadata::{encoder, cstore};
 import middle::trans::common::crate_ctxt;
-import str;
 import std::fs;
-import vec;
-import option;
 import std::run;
-import option::some;
-import option::none;
 import std::sha1::sha1;
 import syntax::ast;
 import syntax::print::pprust;
diff --git a/src/comp/back/rpath.rs b/src/comp/back/rpath.rs
index 27eb9933275..7ed80f0d6d7 100644
--- a/src/comp/back/rpath.rs
+++ b/src/comp/back/rpath.rs
@@ -1,10 +1,4 @@
-import std::os;
-import std::fs;
-import std::os_fs;
-import vec;
-import std::map;
-import str;
-import uint;
+import std::{os, fs, os_fs, map};
 import metadata::cstore;
 import driver::session;
 import util::filesearch;
diff --git a/src/comp/driver/driver.rs b/src/comp/driver/driver.rs
index f03e8d2c16c..52f38afc69a 100644
--- a/src/comp/driver/driver.rs
+++ b/src/comp/driver/driver.rs
@@ -10,11 +10,9 @@ import middle::{trans, resolve, freevars, kind, ty, typeck, fn_usage,
 import syntax::print::{pp, pprust};
 import util::{ppaux, filesearch};
 import back::link;
-import core::{option, str, int, result};
 import result::{ok, err};
 import std::{fs, io, getopts};
 import io::{reader_util, writer_util};
-import option::{some, none};
 import getopts::{optopt, optmulti, optflag, optflagopt, opt_present};
 import back::{x86, x86_64};
 
diff --git a/src/comp/driver/rustc.rs b/src/comp/driver/rustc.rs
index f0e535d36fd..dfed52b8013 100644
--- a/src/comp/driver/rustc.rs
+++ b/src/comp/driver/rustc.rs
@@ -2,11 +2,9 @@ use std;
 use rustc;
 
 // -*- rust -*-
-import core::{option, str, vec, result};
 import result::{ok, err};
 import std::{io, getopts};
 import io::writer_util;
-import option::{some, none};
 import getopts::{opt_present};
 import rustc::driver::driver::*;
 import rustc::syntax::codemap;
diff --git a/src/comp/driver/session.rs b/src/comp/driver/session.rs
index 36991e4e108..b38240b60c3 100644
--- a/src/comp/driver/session.rs
+++ b/src/comp/driver/session.rs
@@ -3,8 +3,6 @@ import syntax::{ast, codemap};
 import syntax::ast::node_id;
 import codemap::span;
 import syntax::ast::{int_ty, uint_ty, float_ty};
-import option;
-import option::{some, none};
 import syntax::parse::parser::parse_sess;
 import util::filesearch;
 import back::target_strs;
diff --git a/src/comp/front/attr.rs b/src/comp/front/attr.rs
index e90fd0ecdfb..9a2aea62570 100644
--- a/src/comp/front/attr.rs
+++ b/src/comp/front/attr.rs
@@ -1,6 +1,5 @@
 // Functions dealing with attributes and meta_items
 
-import core::{either, vec, option};
 import std::map;
 import syntax::{ast, ast_util};
 import driver::session::session;
diff --git a/src/comp/front/config.rs b/src/comp/front/config.rs
index 5e5723680d9..44c88739069 100644
--- a/src/comp/front/config.rs
+++ b/src/comp/front/config.rs
@@ -1,6 +1,4 @@
-import core::{vec, option};
 import syntax::{ast, fold};
-import attr;
 
 export strip_unconfigured_items;
 export metas_in_cfg;
diff --git a/src/comp/front/test.rs b/src/comp/front/test.rs
index 779ab5ed9ff..68119c93584 100644
--- a/src/comp/front/test.rs
+++ b/src/comp/front/test.rs
@@ -1,6 +1,5 @@
 // Code that generates a test runner to run all the tests in a crate
 
-import core::{option, vec};
 import syntax::{ast, ast_util};
 import syntax::ast_util::*;
 //import syntax::ast_util::dummy_sp;
diff --git a/src/comp/lib/llvm.rs b/src/comp/lib/llvm.rs
index 5515d740089..762174549f3 100644
--- a/src/comp/lib/llvm.rs
+++ b/src/comp/lib/llvm.rs
@@ -1,4 +1,3 @@
-import core::{vec, str, option};
 import str::sbuf;
 
 import ctypes::{c_int, c_uint, unsigned, longlong, ulonglong};
diff --git a/src/comp/metadata/common.rs b/src/comp/metadata/common.rs
index 64d28988ff4..f638dfecf1f 100644
--- a/src/comp/metadata/common.rs
+++ b/src/comp/metadata/common.rs
@@ -1,7 +1,5 @@
 // EBML enum definitions and utils shared by the encoder and decoder
 
-import str;
-
 const tag_paths: uint = 0x01u;
 
 const tag_items: uint = 0x02u;
diff --git a/src/comp/metadata/creader.rs b/src/comp/metadata/creader.rs
index 4929b02b7af..6222fc91e2c 100644
--- a/src/comp/metadata/creader.rs
+++ b/src/comp/metadata/creader.rs
@@ -10,7 +10,6 @@ import syntax::codemap::span;
 import util::{filesearch};
 import std::{io, fs};
 import io::writer_util;
-import option::{none, some};
 import std::map::{hashmap, new_int_hash};
 import syntax::print::pprust;
 import common::*;
diff --git a/src/comp/metadata/csearch.rs b/src/comp/metadata/csearch.rs
index 941fedb0c20..7d5ae7048b8 100644
--- a/src/comp/metadata/csearch.rs
+++ b/src/comp/metadata/csearch.rs
@@ -3,7 +3,6 @@
 import syntax::ast;
 import syntax::ast_util;
 import middle::ty;
-import option::{some, none};
 import driver::session;
 
 export get_symbol;
diff --git a/src/comp/metadata/cstore.rs b/src/comp/metadata/cstore.rs
index c6e44bfed05..3a170742bd4 100644
--- a/src/comp/metadata/cstore.rs
+++ b/src/comp/metadata/cstore.rs
@@ -1,7 +1,6 @@
 // The crate store - a central repo for information collected about external
 // crates and libraries
 
-import core::{vec, str};
 import std::map;
 import syntax::ast;
 import util::common::*;
diff --git a/src/comp/metadata/tydecode.rs b/src/comp/metadata/tydecode.rs
index 9a3d6b21512..12cf330189e 100644
--- a/src/comp/metadata/tydecode.rs
+++ b/src/comp/metadata/tydecode.rs
@@ -1,7 +1,5 @@
 // Type decoding
 
-import core::{vec, str, uint};
-import option::{none, some};
 import syntax::ast;
 import syntax::ast::*;
 import syntax::ast_util;
diff --git a/src/comp/metadata/tyencode.rs b/src/comp/metadata/tyencode.rs
index 829947a193f..fd2f20c4913 100644
--- a/src/comp/metadata/tyencode.rs
+++ b/src/comp/metadata/tyencode.rs
@@ -3,7 +3,6 @@
 import std::io;
 import io::writer_util;
 import std::map::hashmap;
-import option::{some, none};
 import syntax::ast::*;
 import driver::session::session;
 import middle::ty;
diff --git a/src/comp/middle/alias.rs b/src/comp/middle/alias.rs
index 1420469004c..292700bbbd5 100644
--- a/src/comp/middle/alias.rs
+++ b/src/comp/middle/alias.rs
@@ -4,10 +4,9 @@ import ast::{ident, fn_ident, node_id};
 import syntax::codemap::span;
 import syntax::visit;
 import visit::vt;
-import core::{vec, option};
 import std::list;
 import std::util::unreachable;
-import option::{some, none, is_none};
+import option::is_none;
 import list::list;
 import driver::session::session;
 import pat_util::*;
diff --git a/src/comp/middle/ast_map.rs b/src/comp/middle/ast_map.rs
index 5973be0cbd7..ca3885d89d7 100644
--- a/src/comp/middle/ast_map.rs
+++ b/src/comp/middle/ast_map.rs
@@ -1,4 +1,3 @@
-import option;
 import std::map;
 import syntax::ast::*;
 import syntax::ast_util;
diff --git a/src/comp/middle/check_alt.rs b/src/comp/middle/check_alt.rs
index bd0182d7bad..543a275096a 100644
--- a/src/comp/middle/check_alt.rs
+++ b/src/comp/middle/check_alt.rs
@@ -5,7 +5,6 @@ import syntax::ast_util::{variant_def_ids, dummy_sp, compare_lit_exprs,
 import syntax::codemap::span;
 import pat_util::*;
 import syntax::visit;
-import option::{some, none};
 import driver::session::session;
 import middle::ty;
 import middle::ty::*;
diff --git a/src/comp/middle/debuginfo.rs b/src/comp/middle/debuginfo.rs
index bb38a101207..fbc3ec44812 100644
--- a/src/comp/middle/debuginfo.rs
+++ b/src/comp/middle/debuginfo.rs
@@ -1,4 +1,3 @@
-import core::{vec, str, option, sys, ctypes, unsafe};
 import std::fs;
 import std::map::hashmap;
 import lib::llvm::llvm;
diff --git a/src/comp/middle/fn_usage.rs b/src/comp/middle/fn_usage.rs
index 6c468cdd1e8..c415f5deb05 100644
--- a/src/comp/middle/fn_usage.rs
+++ b/src/comp/middle/fn_usage.rs
@@ -1,6 +1,5 @@
 import syntax::ast;
 import syntax::visit;
-import option::some;
 import syntax::print::pprust::expr_to_str;
 import driver::session::session;
 
diff --git a/src/comp/middle/freevars.rs b/src/comp/middle/freevars.rs
index cce5b3973b8..8df1fffa919 100644
--- a/src/comp/middle/freevars.rs
+++ b/src/comp/middle/freevars.rs
@@ -2,7 +2,6 @@
 // variables that they contain.
 
 import syntax::print::pprust::path_to_str;
-import int;
 import std::map::*;
 import option::*;
 import syntax::{ast, ast_util, visit};
diff --git a/src/comp/middle/kind.rs b/src/comp/middle/kind.rs
index b9dd96f9abe..2a88fedc84b 100644
--- a/src/comp/middle/kind.rs
+++ b/src/comp/middle/kind.rs
@@ -1,4 +1,3 @@
-import option::{some, none};
 import syntax::{visit, ast_util};
 import syntax::ast::*;
 import syntax::codemap::span;
diff --git a/src/comp/middle/last_use.rs b/src/comp/middle/last_use.rs
index 0f34f270821..db6b55afb18 100644
--- a/src/comp/middle/last_use.rs
+++ b/src/comp/middle/last_use.rs
@@ -3,7 +3,6 @@ import syntax::ast::*;
 import syntax::codemap::span;
 import std::list::{is_not_empty, list, nil, cons, tail};
 import std::util::unreachable;
-import core::{vec, option};
 import std::list;
 
 // Last use analysis pass.
diff --git a/src/comp/middle/mut.rs b/src/comp/middle/mut.rs
index 1e996b4e3d3..d23b97ae885 100644
--- a/src/comp/middle/mut.rs
+++ b/src/comp/middle/mut.rs
@@ -1,5 +1,3 @@
-import core::{vec, str, option};
-import option::{some, none};
 import syntax::ast::*;
 import syntax::visit;
 import syntax::ast_util;
diff --git a/src/comp/middle/resolve.rs b/src/comp/middle/resolve.rs
index 8a0234fc0c3..aeb22d88c49 100644
--- a/src/comp/middle/resolve.rs
+++ b/src/comp/middle/resolve.rs
@@ -13,11 +13,10 @@ import std::map::{new_int_hash, new_str_hash};
 import syntax::codemap::span;
 import syntax::visit;
 import visit::vt;
-import core::{vec, option, str};
 import std::list;
 import std::map::hashmap;
 import std::list::{list, nil, cons};
-import option::{some, none, is_none, is_some};
+import option::{is_none, is_some};
 import syntax::print::pprust::*;
 
 export resolve_crate;
diff --git a/src/comp/middle/shape.rs b/src/comp/middle/shape.rs
index 089aa8eeedb..5da184d1b5a 100644
--- a/src/comp/middle/shape.rs
+++ b/src/comp/middle/shape.rs
@@ -21,9 +21,7 @@ import util::common;
 import trans::build::{Load, Store, Add, GEPi};
 import syntax::codemap::span;
 
-import core::{vec, str};
 import std::map::hashmap;
-import option::{none, some};
 
 import ty_ctxt = middle::ty::ctxt;
 
diff --git a/src/comp/middle/trans/alt.rs b/src/comp/middle/trans/alt.rs
index 20c0d0672da..ee9aa243bab 100644
--- a/src/comp/middle/trans/alt.rs
+++ b/src/comp/middle/trans/alt.rs
@@ -1,6 +1,3 @@
-import core::{str, vec, option};
-import option::{some, none};
-
 import driver::session::session;
 import lib::llvm::llvm;
 import lib::llvm::{ValueRef, BasicBlockRef};
diff --git a/src/comp/middle/trans/base.rs b/src/comp/middle/trans/base.rs
index 596671be9e7..2a4876703a2 100644
--- a/src/comp/middle/trans/base.rs
+++ b/src/comp/middle/trans/base.rs
@@ -13,11 +13,10 @@
 //     but many TypeRefs correspond to one ty::t; for instance, tup(int, int,
 //     int) and rec(x=int, y=int, z=int) will have the same TypeRef.
 
-import core::ctypes::c_uint;
+import ctypes::c_uint;
 import std::{map, time};
 import std::map::hashmap;
 import std::map::{new_int_hash, new_str_hash};
-import option::{some, none};
 import driver::session;
 import session::session;
 import front::attr;
diff --git a/src/comp/middle/trans/build.rs b/src/comp/middle/trans/build.rs
index dd3bf78f46d..9ed3d714feb 100644
--- a/src/comp/middle/trans/build.rs
+++ b/src/comp/middle/trans/build.rs
@@ -1,5 +1,4 @@
-import core::{vec, str};
-import core::ctypes::{c_uint, c_int};
+import ctypes::{c_uint, c_int};
 import str::sbuf;
 import lib::llvm::llvm;
 import syntax::codemap;
diff --git a/src/comp/middle/trans/closure.rs b/src/comp/middle/trans/closure.rs
index 922e53d6251..f46000b921d 100644
--- a/src/comp/middle/trans/closure.rs
+++ b/src/comp/middle/trans/closure.rs
@@ -7,7 +7,6 @@ import common::*;
 import build::*;
 import base::*;
 import middle::freevars::{get_freevars, freevar_info};
-import option::{some, none};
 import back::abi;
 import syntax::codemap::span;
 import syntax::print::pprust::expr_to_str;
diff --git a/src/comp/middle/trans/common.rs b/src/comp/middle/trans/common.rs
index e714dca039c..4497b4abae0 100644
--- a/src/comp/middle/trans/common.rs
+++ b/src/comp/middle/trans/common.rs
@@ -3,11 +3,9 @@
 
 */
 
-import core::{int, vec, str, uint, option, unsafe};
-import core::ctypes::unsigned;
+import ctypes::unsigned;
 import vec::to_ptr;
 import std::map::hashmap;
-import option::some;
 import syntax::ast;
 import driver::session;
 import session::session;
diff --git a/src/comp/middle/trans/impl.rs b/src/comp/middle/trans/impl.rs
index 2de21f8fb2e..dc2ca12b513 100644
--- a/src/comp/middle/trans/impl.rs
+++ b/src/comp/middle/trans/impl.rs
@@ -1,9 +1,8 @@
-import core::ctypes::c_uint;
+import ctypes::c_uint;
 import base::*;
 import common::*;
 import build::*;
 import driver::session::session;
-import option::{some, none};
 import syntax::{ast, ast_util};
 import metadata::csearch;
 import back::{link, abi};
diff --git a/src/comp/middle/trans/tvec.rs b/src/comp/middle/trans/tvec.rs
index b177060fd08..5b6a20e3ce1 100644
--- a/src/comp/middle/trans/tvec.rs
+++ b/src/comp/middle/trans/tvec.rs
@@ -1,5 +1,3 @@
-import vec;
-import option::none;
 import syntax::ast;
 import driver::session::session;
 import lib::llvm::{ValueRef, TypeRef};
diff --git a/src/comp/middle/tstate/annotate.rs b/src/comp/middle/tstate/annotate.rs
index f44ac06e4c1..1689696f207 100644
--- a/src/comp/middle/tstate/annotate.rs
+++ b/src/comp/middle/tstate/annotate.rs
@@ -1,5 +1,4 @@
 
-import core::{int, uint};
 import syntax::ast::*;
 import syntax::visit;
 import syntax::codemap::span;
diff --git a/src/comp/middle/tstate/auxiliary.rs b/src/comp/middle/tstate/auxiliary.rs
index f98b2d0a595..ebd52cc6a5c 100644
--- a/src/comp/middle/tstate/auxiliary.rs
+++ b/src/comp/middle/tstate/auxiliary.rs
@@ -1,4 +1,3 @@
-import core::{vec, int, uint, option};
 import option::*;
 import pat_util::*;
 import syntax::ast::*;
diff --git a/src/comp/middle/tstate/bitvectors.rs b/src/comp/middle/tstate/bitvectors.rs
index f9209d60c16..187afb9dd17 100644
--- a/src/comp/middle/tstate/bitvectors.rs
+++ b/src/comp/middle/tstate/bitvectors.rs
@@ -1,6 +1,5 @@
 import syntax::ast::*;
 import syntax::visit;
-import vec;
 import option::*;
 import aux::*;
 import tstate::ann::{pre_and_post, precond, postcond, prestate, poststate,
diff --git a/src/comp/middle/tstate/ck.rs b/src/comp/middle/tstate/ck.rs
index a3acad64a80..08415119e4a 100644
--- a/src/comp/middle/tstate/ck.rs
+++ b/src/comp/middle/tstate/ck.rs
@@ -6,7 +6,6 @@ import syntax::codemap::span;
 import middle::ty;
 import tstate::ann::{precond, prestate,
                      implies, ann_precond, ann_prestate};
-import option;
 import aux::*;
 import syntax::print::pprust::ty_to_str;
 import bitvectors::*;
diff --git a/src/comp/middle/tstate/pre_post_conditions.rs b/src/comp/middle/tstate/pre_post_conditions.rs
index f9a3740c049..a23124cd840 100644
--- a/src/comp/middle/tstate/pre_post_conditions.rs
+++ b/src/comp/middle/tstate/pre_post_conditions.rs
@@ -1,7 +1,3 @@
-
-import core::{vec, option};
-import option::{none, some};
-
 import tstate::ann::*;
 import aux::*;
 import bitvectors::{bit_num, seq_preconds, seq_postconds,
diff --git a/src/comp/middle/tstate/states.rs b/src/comp/middle/tstate/states.rs
index 854617cea0a..815b86f2fe8 100644
--- a/src/comp/middle/tstate/states.rs
+++ b/src/comp/middle/tstate/states.rs
@@ -1,5 +1,3 @@
-import core::{vec, option};
-import option::{none, some};
 import ann::*;
 import aux::*;
 import tritv::{tritv_clone, tritv_set, ttrue};
diff --git a/src/comp/middle/ty.rs b/src/comp/middle/ty.rs
index 0fe35a31b78..80ad164fab5 100644
--- a/src/comp/middle/ty.rs
+++ b/src/comp/middle/ty.rs
@@ -1,13 +1,5 @@
-import vec;
-import str;
-import uint;
-import std::ufind;
-import std::map;
+import std::{ufind, map, smallintmap};
 import std::map::hashmap;
-import option;
-import option::none;
-import option::some;
-import std::smallintmap;
 import driver::session;
 import session::session;
 import syntax::ast;
diff --git a/src/comp/middle/typeck.rs b/src/comp/middle/typeck.rs
index a26ef788abd..dcc257956c7 100644
--- a/src/comp/middle/typeck.rs
+++ b/src/comp/middle/typeck.rs
@@ -13,10 +13,8 @@ import middle::ty::{node_id_to_type, arg, block_ty,
                     ty_param_bounds_and_ty};
 import util::ppaux::ty_to_str;
 import middle::ty::unify::{ures_ok, ures_err, fix_ok, fix_err};
-import core::{int, vec, str, option};
 import std::smallintmap;
 import std::map::{hashmap, new_int_hash};
-import option::{none, some};
 import syntax::print::pprust::*;
 
 export check_crate;
diff --git a/src/comp/syntax/ast.rs b/src/comp/syntax/ast.rs
index 7f4b84ef78e..5c831a5fbe7 100644
--- a/src/comp/syntax/ast.rs
+++ b/src/comp/syntax/ast.rs
@@ -1,6 +1,5 @@
 // The Rust abstract syntax tree.
 
-import option;
 import codemap::{span, filename};
 
 type spanned<T> = {node: T, span: span};
diff --git a/src/comp/syntax/codemap.rs b/src/comp/syntax/codemap.rs
index 7af9efe5984..5d8d7ff5633 100644
--- a/src/comp/syntax/codemap.rs
+++ b/src/comp/syntax/codemap.rs
@@ -1,6 +1,3 @@
-import core::{vec, uint, str, option, result};
-import option::{some, none};
-
 type filename = str;
 
 type file_pos = {ch: uint, byte: uint};
diff --git a/src/comp/syntax/ext/base.rs b/src/comp/syntax/ext/base.rs
index 6ab1c8446cf..d59591d849a 100644
--- a/src/comp/syntax/ext/base.rs
+++ b/src/comp/syntax/ext/base.rs
@@ -1,9 +1,7 @@
-import core::{vec, option};
 import std::map::hashmap;
 import driver::session::session;
 import codemap::{span, expn_info, expanded_from};
 import std::map::new_str_hash;
-import codemap;
 
 type syntax_expander_ =
     fn@(ext_ctxt, span, ast::mac_arg, ast::mac_body) -> @ast::expr;
diff --git a/src/comp/syntax/ext/build.rs b/src/comp/syntax/ext/build.rs
index ec7ff4707cd..4d0cfa75a14 100644
--- a/src/comp/syntax/ext/build.rs
+++ b/src/comp/syntax/ext/build.rs
@@ -1,5 +1,3 @@
-import core::{vec, str, option};
-import option::{some};
 import codemap::span;
 import syntax::ext::base::ext_ctxt;
 
diff --git a/src/comp/syntax/ext/concat_idents.rs b/src/comp/syntax/ext/concat_idents.rs
index 538c40a9d66..4b9402f9cd9 100644
--- a/src/comp/syntax/ext/concat_idents.rs
+++ b/src/comp/syntax/ext/concat_idents.rs
@@ -1,4 +1,3 @@
-import option;
 import base::*;
 import syntax::ast;
 
diff --git a/src/comp/syntax/ext/env.rs b/src/comp/syntax/ext/env.rs
index b9b42028c0f..cb9453ae062 100644
--- a/src/comp/syntax/ext/env.rs
+++ b/src/comp/syntax/ext/env.rs
@@ -4,7 +4,6 @@
  * should all get sucked into either the compiler syntax extension plugin
  * interface.
  */
-import core::{vec, option};
 import std::generic_os;
 import base::*;
 export expand_syntax_ext;
diff --git a/src/comp/syntax/ext/expand.rs b/src/comp/syntax/ext/expand.rs
index b91b794571f..8fc0fdcdf23 100644
--- a/src/comp/syntax/ext/expand.rs
+++ b/src/comp/syntax/ext/expand.rs
@@ -1,9 +1,6 @@
 import driver::session;
 
-import option::{none, some};
-
 import std::map::hashmap;
-import vec;
 
 import syntax::ast::{crate, expr_, expr_mac, mac_invoc};
 import syntax::fold::*;
diff --git a/src/comp/syntax/ext/fmt.rs b/src/comp/syntax/ext/fmt.rs
index b7834175d2f..29b19a2d66c 100644
--- a/src/comp/syntax/ext/fmt.rs
+++ b/src/comp/syntax/ext/fmt.rs
@@ -5,8 +5,6 @@
  * should all get sucked into either the standard library extfmt module or the
  * compiler syntax extension plugin interface.
  */
-import core::{vec, str, option};
-import option::{some};
 import extfmt::ct::*;
 import base::*;
 import codemap::span;
diff --git a/src/comp/syntax/ext/ident_to_str.rs b/src/comp/syntax/ext/ident_to_str.rs
index 9245e5aa6d4..2bb6dac7f2a 100644
--- a/src/comp/syntax/ext/ident_to_str.rs
+++ b/src/comp/syntax/ext/ident_to_str.rs
@@ -1,4 +1,3 @@
-import core::{vec, option};
 import base::*;
 import syntax::ast;
 
diff --git a/src/comp/syntax/ext/qquote.rs b/src/comp/syntax/ext/qquote.rs
index 071c51294d9..39bd34785ba 100644
--- a/src/comp/syntax/ext/qquote.rs
+++ b/src/comp/syntax/ext/qquote.rs
@@ -1,7 +1,5 @@
 import driver::session;
 
-import option::{none, some};
-
 import syntax::ast::{crate, expr_, mac_invoc,
                      mac_aq, mac_var};
 import syntax::fold::*;
diff --git a/src/comp/syntax/ext/simplext.rs b/src/comp/syntax/ext/simplext.rs
index 6304df29e26..df281640210 100644
--- a/src/comp/syntax/ext/simplext.rs
+++ b/src/comp/syntax/ext/simplext.rs
@@ -1,9 +1,7 @@
 use std;
 
 import codemap::span;
-import core::{vec, option};
 import std::map::{hashmap, new_str_hash};
-import option::{some, none};
 import driver::session::session;
 
 import base::*;
diff --git a/src/comp/syntax/fold.rs b/src/comp/syntax/fold.rs
index 09c9a46e73f..5e30e0c5a3a 100644
--- a/src/comp/syntax/fold.rs
+++ b/src/comp/syntax/fold.rs
@@ -1,8 +1,6 @@
 import syntax::codemap::span;
 import ast::*;
 
-import core::{vec, option};
-
 export ast_fold_precursor;
 export ast_fold;
 export default_ast_fold;
diff --git a/src/comp/syntax/parse/eval.rs b/src/comp/syntax/parse/eval.rs
index 74d2259c51e..06f26905550 100644
--- a/src/comp/syntax/parse/eval.rs
+++ b/src/comp/syntax/parse/eval.rs
@@ -1,8 +1,6 @@
 
 import front::attr;
-import core::{option, result};
 import std::{io, fs};
-import option::{some, none};
 import syntax::ast;
 import syntax::parse::token;
 import syntax::parse::parser::{parser, new_parser_from_file,
diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs
index 143b4eba487..053a828f07a 100644
--- a/src/comp/syntax/parse/lexer.rs
+++ b/src/comp/syntax/parse/lexer.rs
@@ -1,11 +1,8 @@
 
-import core::{vec, str, option, either};
 import std::io;
 import io::reader_util;
-import option::{some, none};
 import util::interner;
 import util::interner::intern;
-import codemap;
 import driver::diagnostic;
 
 type reader = @{
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index a988557b84d..8ef68ca6388 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -1,6 +1,4 @@
-import core::{vec, str, option, either, result};
 import std::{io, fs};
-import option::{some, none};
 import either::{left, right};
 import std::map::{hashmap, new_str_hash};
 import token::can_begin_expr;
diff --git a/src/comp/syntax/parse/token.rs b/src/comp/syntax/parse/token.rs
index d71ec1c2831..14f7c055743 100644
--- a/src/comp/syntax/parse/token.rs
+++ b/src/comp/syntax/parse/token.rs
@@ -1,6 +1,5 @@
 
 import util::interner;
-import core::{int, uint, str};
 import lexer::reader;
 
 type str_num = uint;
diff --git a/src/comp/syntax/print/pp.rs b/src/comp/syntax/print/pp.rs
index 54227235957..d970f9eb23b 100644
--- a/src/comp/syntax/print/pp.rs
+++ b/src/comp/syntax/print/pp.rs
@@ -1,5 +1,4 @@
 
-import core::{vec, str};
 import std::io;
 import io::writer_util;
 
diff --git a/src/comp/syntax/print/pprust.rs b/src/comp/syntax/print/pprust.rs
index a60e68b335d..f11ca11adfa 100644
--- a/src/comp/syntax/print/pprust.rs
+++ b/src/comp/syntax/print/pprust.rs
@@ -1,11 +1,7 @@
 
-import core::{vec, int, str, uint, option};
 import std::io;
 import parse::lexer;
 import syntax::codemap::codemap;
-import ast;
-import ast_util;
-import option::{some, none};
 import pp::{break_offset, word, printer,
             space, zerobreak, hardbreak, breaks, consistent,
             inconsistent, eof};
diff --git a/src/comp/syntax/util/interner.rs b/src/comp/syntax/util/interner.rs
index a7d8431da79..c7f0d7ecb99 100644
--- a/src/comp/syntax/util/interner.rs
+++ b/src/comp/syntax/util/interner.rs
@@ -1,10 +1,8 @@
 // An "interner" is a data structure that associates values with uint tags and
 // allows bidirectional lookup; i.e. given a value, one can easily find the
 // type, and vice versa.
-import core::vec;
 import std::map;
 import std::map::{hashmap, hashfn, eqfn};
-import option::{none, some};
 
 type interner<T> =
     {map: hashmap<T, uint>,
diff --git a/src/comp/syntax/visit.rs b/src/comp/syntax/visit.rs
index 571deb576c4..2065927ccc9 100644
--- a/src/comp/syntax/visit.rs
+++ b/src/comp/syntax/visit.rs
@@ -1,10 +1,7 @@
 
 import ast::*;
-import option;
-import option::{none, some};
 import codemap::span;
 
-
 // Context-passing AST walker. Each overridden visit method has full control
 // over what happens with its node, it can do its own traversal of the node's
 // children (potentially passing in different contexts to each), call
diff --git a/src/comp/util/common.rs b/src/comp/util/common.rs
index b96165fb473..87a1f6145d6 100644
--- a/src/comp/util/common.rs
+++ b/src/comp/util/common.rs
@@ -1,6 +1,5 @@
 import math::{max, min};
 import std::map::hashmap;
-import option::{some};
 import syntax::ast;
 import ast::{ty, pat};
 import syntax::codemap::{span};
diff --git a/src/comp/util/filesearch.rs b/src/comp/util/filesearch.rs
index 0e4c3671bf1..7f3b11adc97 100644
--- a/src/comp/util/filesearch.rs
+++ b/src/comp/util/filesearch.rs
@@ -2,12 +2,7 @@
 // FIXME: I'm not happy how this module turned out. Should probably
 // just be folded into cstore.
 
-import core::option;
-import std::fs;
-import vec;
-import std::os;
-import result;
-import std::generic_os;
+import std::{fs, os, generic_os};
 
 export filesearch;
 export mk_filesearch;
diff --git a/src/comp/util/ppaux.rs b/src/comp/util/ppaux.rs
index db7d6de5f8b..985c710c659 100644
--- a/src/comp/util/ppaux.rs
+++ b/src/comp/util/ppaux.rs
@@ -1,5 +1,3 @@
-import core::{vec, str, int, option};
-import option::{none, some};
 import middle::ty;
 import middle::ty::*;
 import metadata::encoder;
diff --git a/src/libstd/io.rs b/src/libstd/io.rs
index 95f275a9be0..0fb000c8315 100644
--- a/src/libstd/io.rs
+++ b/src/libstd/io.rs
@@ -264,7 +264,7 @@ fn string_reader(s: str) -> reader {
 
 
 // Writing
-enum fileflag { append, create, truncate, none, }
+enum fileflag { append, create, truncate, no_flag, }
 
 // FIXME: Seekable really should be orthogonal.
 // FIXME: eventually u64
@@ -350,7 +350,7 @@ fn mk_file_writer(path: str, flags: [fileflag])
           append { fflags |= os::libc_constants::O_APPEND; }
           create { fflags |= os::libc_constants::O_CREAT; }
           truncate { fflags |= os::libc_constants::O_TRUNC; }
-          none { }
+          no_flag { }
         }
     }
     let fd = str::as_buf(path, {|pathbuf|