Merge pull request #162 from cassiersg/sep-mods

Move modules listing outside of FmtVisitor
rust-lang · Aug 2, 2015 · d07eb28 · d07eb28
2 parents bc43b81 + 5a29d2f
commit d07eb28
Show file tree

Hide file tree

Showing 13 changed files with 273 additions and 386 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/src/changes.rs b/src/changes.rs
diff --git a/src/expr.rs b/src/expr.rs
@@ -138,13 +138,9 @@ impl Rewrite for ast::Block {
 
         // Push text between last block item and end of block
         let snippet = visitor.snippet(mk_sp(visitor.last_pos, self.span.hi));
-        visitor.changes.push_str_span(self.span, &snippet);
+        visitor.buffer.push_str(&snippet);
 
-        // Stringify visitor
-        let file_name = context.codemap.span_to_filename(self.span);
-        let string_buffer = visitor.changes.get(&file_name);
-
-        Some(format!("{}{}", prefix, string_buffer))
+        Some(format!("{}{}", prefix, visitor.buffer))
     }
 }