Revert "rustc: Switch over to resolve3" due to Linux failures

This reverts commit 2c0aa257e293dde91042a8045100d9923d139a04.

5 files changed, 10 insertions, 8 deletions

diff --git a/src/libsyntax/ext/pipes.rs b/src/libsyntax/ext/pipes.rs
index 9a7bcc0e171..4ca47254a94 100644
--- a/src/libsyntax/ext/pipes.rs
+++ b/src/libsyntax/ext/pipes.rs
@@ -8,7 +8,7 @@ import parse::common::parser_common;
 
 import pipes::parse_proto::proto_parser;
 
-import pipes::pipec::methods;
+import pipes::pipec::*;
 
 fn expand_proto(cx: ext_ctxt, _sp: span, id: ast::ident, tt: ast::token_tree)
     -> @ast::item
@@ -26,4 +26,4 @@ fn expand_proto(cx: ext_ctxt, _sp: span, id: ast::ident, tt: ast::token_tree)
     let proto = rust_parser.parse_proto(id);
 
     proto.compile(cx)
-}
+}
\ No newline at end of file
diff --git a/src/libsyntax/parse.rs b/src/libsyntax/parse.rs
index 4d6bd53d8df..7a9ec6f32a4 100644
--- a/src/libsyntax/parse.rs
+++ b/src/libsyntax/parse.rs
@@ -12,14 +12,17 @@ export parse_crate_from_source_str;
 export parse_expr_from_source_str, parse_item_from_source_str;
 export parse_from_source_str;
 
+// this used to be `import common::parser_common`, but it was causing
+// unresolved import errors. Maybe resolve3 will fix it.
+import common::*;
 import parser::parser;
 import attr::parser_attr;
 import common::parser_common;
 import ast::node_id;
 import util::interner;
+// FIXME (#1935): resolve badness
+import lexer::*;
 import diagnostic::{span_handler, mk_span_handler, mk_handler, emitter};
-import lexer::{reader, string_reader, string_reader_as_reader};
-import lexer::{tt_reader_as_reader};
 
 type parse_sess = @{
     cm: codemap::codemap,
diff --git a/src/libsyntax/parse/comments.rs b/src/libsyntax/parse/comments.rs
index 31069225c03..d351d492fb0 100644
--- a/src/libsyntax/parse/comments.rs
+++ b/src/libsyntax/parse/comments.rs
@@ -1,8 +1,8 @@
 import io::reader_util;
 import io::println;//XXXXXXXXxxx
 import util::interner;
-import lexer::{string_reader, bump, is_eof, nextch,
-               is_whitespace, get_str_from, string_reader_as_reader, reader};
+import lexer::{ string_reader, bump, is_eof, nextch,
+               is_whitespace, get_str_from, string_reader_as_reader };
 
 export cmnt;
 export lit;
diff --git a/src/libsyntax/parse/common.rs b/src/libsyntax/parse/common.rs
index 6f11f18540a..16059b473bb 100644
--- a/src/libsyntax/parse/common.rs
+++ b/src/libsyntax/parse/common.rs
@@ -1,7 +1,6 @@
 import std::map::{hashmap};
 import ast_util::spanned;
 import parser::parser;
-import lexer::reader;
 
 type seq_sep = {
     sep: option<token::token>,
diff --git a/src/libsyntax/parse/parser.rs b/src/libsyntax/parse/parser.rs
index 882957ade5b..7d36216aa9b 100644
--- a/src/libsyntax/parse/parser.rs
+++ b/src/libsyntax/parse/parser.rs
@@ -5,7 +5,7 @@ import token::{can_begin_expr, is_ident, is_plain_ident, ACTUALLY};
 import codemap::{span,fss_none};
 import util::interner;
 import ast_util::{spanned, respan, mk_sp, ident_to_path, operator_prec};
-import lexer::{reader, tt_reader_as_reader};
+import lexer::reader;
 import prec::{as_prec, token_to_binop};
 import attr::parser_attr;
 import common::{seq_sep_trailing_disallowed, seq_sep_trailing_allowed,