---

yaml
---
r: 136424
b: refs/heads/dist-snap
c: 3a01d0f
h: refs/heads/master
v: v3

Author: nrc

[refs]

@@ -6,7 +6,7 @@ refs/heads/try: 189b7332968972f34cdbbbd9b62d97ababf53059
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b
 refs/heads/try2: 147ecfdd8221e4a4d4e090486829a06da1e0ca3c
-refs/heads/dist-snap: 74db87b99d48f318e96acb91482599b906be0a7e
+refs/heads/dist-snap: 3a01d0f1e3ab88a8b891a5cfeb552a78cbf69670
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/heads/try3: 9387340aab40a73e8424c48fd42f0c521a4875c0

branches/dist-snap/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()
     }

branches/dist-snap/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;

branches/dist-snap/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) {