Round 3 test fixes and conflicts

2015-02-18 15:58:07 -08:00
parent 1506b34e0c
commit d6e939a2df
28 changed files with 127 additions and 135 deletions
--- a/src/libsyntax/print/pp.rs
+++ b/src/libsyntax/print/pp.rs
@@ -539,8 +539,8 @@ impl Printer {
    pub fn print(&mut self, token: Token, l: isize) -> old_io::IoResult<()> {
        debug!("print {} {} (remaining line space={})", tok_str(&token), l,
               self.space);
-        debug!("{}", buf_str(&self.token[],
-                             &self.size[],
+        debug!("{}", buf_str(&self.token,
+                             &self.size,
                             self.left,
                             self.right,
                             6));