fix tests, remove some warnings

5 files changed, 2 insertions, 7 deletions

diff --git a/src/libsyntax/ast_map.rs b/src/libsyntax/ast_map.rs
index 8a379a6213a..2e60f7d02df 100644
--- a/src/libsyntax/ast_map.rs
+++ b/src/libsyntax/ast_map.rs
@@ -24,7 +24,6 @@ use syntax::parse::token::special_idents;
 
 use core::cmp;
 use core::hashmap::HashMap;
-use core::str;
 use core::vec;
 
 pub enum path_elt {
diff --git a/src/libsyntax/ast_util.rs b/src/libsyntax/ast_util.rs
index db7c29edab0..3d6269942fd 100644
--- a/src/libsyntax/ast_util.rs
+++ b/src/libsyntax/ast_util.rs
@@ -23,7 +23,6 @@ use visit;
 use core::hashmap::HashMap;
 use core::int;
 use core::option;
-use core::str;
 use core::to_bytes;
 
 pub fn path_name_i(idents: &[ident]) -> ~str {
diff --git a/src/libsyntax/ext/asm.rs b/src/libsyntax/ext/asm.rs
index 14cbd170c48..d3efd07aa04 100644
--- a/src/libsyntax/ext/asm.rs
+++ b/src/libsyntax/ext/asm.rs
@@ -21,7 +21,6 @@ use ext::base::*;
 use parse;
 use parse::token;
 
-use core::str;
 use core::vec;
 
 enum State {
diff --git a/src/libsyntax/ext/pipes/liveness.rs b/src/libsyntax/ext/pipes/liveness.rs
index cb7386b9880..1076c5d0b98 100644
--- a/src/libsyntax/ext/pipes/liveness.rs
+++ b/src/libsyntax/ext/pipes/liveness.rs
@@ -42,7 +42,6 @@ use core::prelude::*;
 use ext::base::ExtCtxt;
 use ext::pipes::proto::{protocol_};
 
-use core::str;
 use extra::bitv::Bitv;
 
 pub fn analyze(proto: @mut protocol_, _cx: @ExtCtxt) {
diff --git a/src/libsyntax/ext/tt/macro_parser.rs b/src/libsyntax/ext/tt/macro_parser.rs
index 0c9ca98fb9d..e5a77cc21fb 100644
--- a/src/libsyntax/ext/tt/macro_parser.rs
+++ b/src/libsyntax/ext/tt/macro_parser.rs
@@ -24,7 +24,6 @@ use parse::token;
 
 use core::iterator::IteratorUtil;
 use core::hashmap::HashMap;
-use core::str;
 use core::uint;
 use core::vec;
 
@@ -371,14 +370,14 @@ pub fn parse(
         } else {
             if (bb_eis.len() > 0u && next_eis.len() > 0u)
                 || bb_eis.len() > 1u {
-                let nts = vec::map(bb_eis.connect(|ei| {
+                let nts = bb_eis.map(|ei| {
                     match ei.elts[ei.idx].node {
                       match_nonterminal(ref bind,ref name,_) => {
                         fmt!("%s ('%s')", *ident_to_str(name),
                              *ident_to_str(bind))
                       }
                       _ => fail!()
-                    } }), " or ");
+                    } }).connect(" or ");
                 return error(sp, fmt!(
                     "Local ambiguity: multiple parsing options: \
                      built-in NTs %s or %u other options.",