1 files changed, 10 insertions, 10 deletions
diff --git a/src/lib.rs b/src/lib.rs
index 82e3ba6..91938f1 100644
--- a/src/lib.rs
+++ b/src/lib.rs
@@ -717,14 +717,14 @@ impl Block {
     pub fn debug_print(&self) {
         println!("     === {} ===", self.name.blue());
         for (i, s) in self.ops.iter().enumerate() {
-            // TODO(ed): This print should only do one call to print.
-            // Otherwise we can get race conditions in a single line.
-            if self.line_offsets.contains_key(&i) {
-                print!("{:5} ", self.line_offsets[&i].red());
-            } else {
-                print!("    {} ", "|".red());
-            }
-            println!("{:05} {:?}", i.blue(), s);
+            println!("{}{}",
+                     if self.line_offsets.contains_key(&i) {
+                         format!("{:5} ", self.line_offsets[&i].red())
+                     } else {
+                         format!("    {} ", "|".red())
+                     },
+                     format!("{:05} {:?}", i.blue(), s)
+            );
         }
         println!();
     }
@@ -832,7 +832,7 @@ mod tests {
                 "Test produced incorrect result"
             },
         };
-        println!("    #### {} ####", msg.red());
+        eprintln!("    #### {} ####", msg.red());
         panic!(msg);
     }
 
@@ -846,7 +846,7 @@ mod tests {
                         Ok(()) => {},
                         Err(errs) => {
                             for e in errs.iter() {
-                                println!("{}", e);
+                                eprintln!("{}", e);
                             }
                             eprintln!("  {} - failed\n", stringify!($fn));
                             unreachable!();