Factor imports mindlessly.

4 files changed, 13 insertions, 33 deletions

diff --git a/src/comp/syntax/parse/eval.rs b/src/comp/syntax/parse/eval.rs
index d525425dda7..ab0dfdcf706 100644
--- a/src/comp/syntax/parse/eval.rs
+++ b/src/comp/syntax/parse/eval.rs
@@ -1,15 +1,11 @@
 
-import std::str;
-import std::option;
-import std::option::some;
-import std::option::none;
+import std::{str, option};
+import std::option::{some, none};
 import syntax::ast;
 import syntax::parse::token;
-import syntax::parse::parser::parser;
-import syntax::parse::parser::new_parser_from_file;
-import syntax::parse::parser::parse_inner_attrs_and_next;
-import syntax::parse::parser::parse_mod_items;
-import syntax::parse::parser::SOURCE_FILE;
+import syntax::parse::parser::{parser, new_parser_from_file, 
+                               parse_inner_attrs_and_next,
+                               parse_mod_items, SOURCE_FILE};
 
 export eval_crate_directives_to_mod;
 export mode_parse;
diff --git a/src/comp/syntax/parse/lexer.rs b/src/comp/syntax/parse/lexer.rs
index 287b7fc1d39..bad8c01afa8 100644
--- a/src/comp/syntax/parse/lexer.rs
+++ b/src/comp/syntax/parse/lexer.rs
@@ -1,13 +1,7 @@
 
-import std::io;
-import std::int;
-import std::vec;
-import std::str;
-import std::map;
+import std::{io, int, vec, str, map, option};
 import std::map::hashmap;
-import std::option;
-import std::option::some;
-import std::option::none;
+import std::option::{some, none};
 import util::interner;
 import util::interner::intern;
 import codemap;
diff --git a/src/comp/syntax/parse/parser.rs b/src/comp/syntax/parse/parser.rs
index 4933e6cdcd0..be54b38a68a 100644
--- a/src/comp/syntax/parse/parser.rs
+++ b/src/comp/syntax/parse/parser.rs
@@ -1,21 +1,13 @@
 
-import std::io;
-import std::vec;
-import std::str;
-import std::option;
-import std::option::some;
-import std::option::none;
-import std::either;
-import std::either::left;
-import std::either::right;
-import std::map::hashmap;
+import std::{io, vec, str, option, either};
+import std::option::{some, none};
+import std::either::{left, right};
+import std::map::{hashmap, new_str_hash};
 import token::can_begin_expr;
 import ex = ext::base;
 import codemap::span;
-import std::map::new_str_hash;
 import util::interner;
-import ast::node_id;
-import ast::spanned;
+import ast::{node_id, spanned};
 
 tag restriction { UNRESTRICTED; RESTRICT_NO_CALL_EXPRS; }
 
diff --git a/src/comp/syntax/parse/token.rs b/src/comp/syntax/parse/token.rs
index 7e7f7e2652c..5a445768251 100644
--- a/src/comp/syntax/parse/token.rs
+++ b/src/comp/syntax/parse/token.rs
@@ -3,9 +3,7 @@ import ast::ty_mach;
 import ast_util::ty_mach_to_str;
 import std::map::new_str_hash;
 import util::interner;
-import std::int;
-import std::uint;
-import std::str;
+import std::{int, uint, str};
 
 type str_num = uint;