---

yaml
---
r: 63563
b: refs/heads/snap-stage3
c: 69e0704
h: refs/heads/master
i:
  63561: 1204fad
  63559: 3783355
v: v3

Author: thestinger

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 2d28d645422c1617be58c8ca7ad9a457264ca850
 refs/heads/snap-stage1: e33de59e47c5076a89eadeb38f4934f58a3618a6
-refs/heads/snap-stage3: df626ea137af1436cb2e5eda19c145363db801c9
+refs/heads/snap-stage3: 69e0704520c5296282a33e39ff056921e3cff7d3
 refs/heads/try: 7b78b52e602bb3ea8174f9b2006bff3315f03ef9
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/heads/ndm: f3868061cd7988080c30d6d5bf352a5a5fe2460b

branches/snap-stage3/src/libsyntax/diagnostic.rs

@@ -189,30 +189,36 @@ fn diagnosticcolor(lvl: level) -> u8 {
     }
 }
 
-fn print_diagnostic(topic: &str, lvl: level, msg: &str) {
-    let t = term::Terminal::new(io::stderr());
-
+fn print_maybe_colored(msg: &str, color: u8) {
     let stderr = io::stderr();
 
-    if !topic.is_empty() {
-        stderr.write_str(fmt!("%s ", topic));
-    }
+    let t = term::Terminal::new(stderr);
 
     match t {
         Ok(term) => {
             if stderr.get_type() == io::Screen {
-                term.fg(diagnosticcolor(lvl));
-                stderr.write_str(fmt!("%s: ", diagnosticstr(lvl)));
+                term.fg(color);
+                stderr.write_str(msg);
                 term.reset();
-                stderr.write_str(fmt!("%s\n", msg));
             } else {
-                stderr.write_str(fmt!("%s: %s\n", diagnosticstr(lvl), msg));
+                stderr.write_str(msg);
             }
         },
-        _ => stderr.write_str(fmt!("%s: %s\n", diagnosticstr(lvl), msg))
+        _ => stderr.write_str(msg)
     }
 }
 
+fn print_diagnostic(topic: &str, lvl: level, msg: &str) {
+    let stderr = io::stderr();
+
+    if !topic.is_empty() {
+        stderr.write_str(fmt!("%s ", topic));
+    }
+
+    print_maybe_colored(fmt!("%s: ", diagnosticstr(lvl)), diagnosticcolor(lvl));
+    stderr.write_str(fmt!("%s\n", msg));
+}
+
 pub fn collect(messages: @mut ~[~str])
             -> @fn(Option<(@codemap::CodeMap, span)>, &str, level) {
     let f: @fn(Option<(@codemap::CodeMap, span)>, &str, level) =
@@ -292,14 +298,15 @@ fn highlight_lines(cm: @codemap::CodeMap,
                 _ => " "         // -squigly-line as well (instead of a
             };                   // space). This way the squigly-line will
         }                        // usually appear in the correct position.
-        s += "^";
+        io::stderr().write_str(s);
+        let mut s = ~"^";
         let hi = cm.lookup_char_pos(sp.hi);
         if hi.col != lo.col {
             // the ^ already takes up one space
             let num_squiglies = hi.col.to_uint()-lo.col.to_uint()-1u;
             for num_squiglies.times() { s += "~"; }
         }
-        io::stderr().write_str(s + "\n");
+        print_maybe_colored(s + "\n", term::color_bright_green);
     }
 }
 

branches/snap-stage3/src/libsyntax/ext/fmt.rs

@@ -249,11 +249,6 @@ fn pieces_to_expr(cx: @ExtCtxt, sp: span,
         }
     }
 
-    /* Short circuit an easy case up front (won't work otherwise) */
-    if pieces.len() == 0 {
-        return cx.expr_str_uniq(args[0].span, @"");
-    }
-
     let fmt_sp = args[0].span;
     let mut n = 0u;
     let nargs = args.len();

branches/snap-stage3/src/test/run-pass/syntax-extension-fmt.rs

@@ -58,9 +58,6 @@ fn part1() {
     test(fmt!("%x", 0xffffffff_u), ~"ffffffff");
     test(fmt!("%o", 0xffffffff_u), ~"37777777777");
     test(fmt!("%t", 0xffffffff_u), ~"11111111111111111111111111111111");
-
-    // Don't result in a compilation error
-    test(fmt!(""), ~"");
 }
 fn part2() {
     // Widths