rebasing fixes

Author: nrc

src/libsyntax/ast_map/mod.rs

@@ -15,7 +15,6 @@ use ast_util::PostExpansionMethod;
 use codemap::{DUMMY_SP, Span, Spanned};
 use fold::Folder;
 use parse::token;
-use parse::ParseSess;
 use print::pprust;
 use visit::{mod, Visitor};
 
@@ -251,7 +250,6 @@ pub struct Map<'ast> {
 }
 
 impl<'ast> Map<'ast> {
-impl Map {
     fn entry_count(&self) -> uint {
         self.map.borrow().len()
     }

src/libsyntax/parse/mod.rs

@@ -17,7 +17,7 @@ use parse::attr::ParserAttr;
 use parse::parser::Parser;
 use ptr::P;
 
-use std::cell::RefCell;
+use std::cell::{Cell, RefCell};
 use std::io::File;
 use std::rc::Rc;
 use std::str;

src/libsyntax/show_span.rs

@@ -22,10 +22,10 @@ struct ShowSpanVisitor<'a> {
     span_diagnostic: &'a diagnostic::SpanHandler,
 }
 
-impl<'a> Visitor<()> for ShowSpanVisitor<'a> {
-    fn visit_expr(&mut self, e: &ast::Expr, _: ()) {
+impl<'a, 'v> Visitor<'v> for ShowSpanVisitor<'a> {
+    fn visit_expr(&mut self, e: &ast::Expr) {
         self.span_diagnostic.span_note(e.span, "expression");
-        visit::walk_expr(self, e, ());
+        visit::walk_expr(self, e);
     }
 
     fn visit_mac(&mut self, macro: &ast::Mac) {