---

yaml
---
r: 277935
b: refs/heads/auto
c: f6496cd
h: refs/heads/master
i:
  277933: 0cefc8d
  277931: 87a5be4
  277927: 5488818
  277919: d0325e5

Author: nikomatsakis

[refs]

@@ -8,7 +8,7 @@ refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503
 refs/tags/release-0.3.1: 495bae036dfe5ec6ceafd3312b4dca48741e845b
 refs/tags/release-0.4: e828ea2080499553b97dfe33b3f4d472b4562ad7
 refs/tags/release-0.5: 7e3bcfbf21278251ee936ad53e92e9b719702d73
-refs/heads/auto: d5529f000da43fe2e9f2aad03f747b0144da9354
+refs/heads/auto: f6496cd3700a9a4e3dc1a6d3245287066f4b99e4
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

branches/auto/src/libsyntax/errors/emitter.rs

@@ -131,6 +131,9 @@ pub struct EmitterWriter {
     dst: Destination,
     registry: Option<diagnostics::registry::Registry>,
     cm: Rc<codemap::CodeMap>,
+
+    /// Is this the first error emitted thus far? If not, we emit a
+    /// `\n` before the top-level errors.
     first: bool,
 }
 
@@ -172,7 +175,9 @@ impl EmitterWriter {
             EmitterWriter { dst: dst, registry: registry, cm: code_map, first: true }
         } else {
             EmitterWriter { dst: Raw(Box::new(io::stderr())),
-                registry: registry, cm: code_map, first: true }
+                            registry: registry,
+                            cm: code_map,
+                            first: true }
         }
     }
 

branches/auto/src/libsyntax/errors/snippet/mod.rs

@@ -16,7 +16,6 @@ use std::rc::Rc;
 use std::mem;
 use std::ops::Range;
 
-#[cfg(test)]
 mod test;
 
 pub struct SnippetData {
@@ -210,8 +209,7 @@ impl<S> From<(S, Style, RenderedLineKind)> for RenderedLine
 impl<S1,S2> From<(S1, Style, S2, Style, RenderedLineKind)> for RenderedLine
     where S1: StringSource, S2: StringSource
 {
-    fn from(tuple: (S1, Style, S2, Style, RenderedLineKind))
-            -> Self {
+    fn from(tuple: (S1, Style, S2, Style, RenderedLineKind)) -> Self {
         let (text1, style1, text2, style2, kind) = tuple;
         RenderedLine {
             text: vec![

branches/auto/src/libsyntax/errors/snippet/test.rs

@@ -1,4 +1,4 @@
-// Copyright 2012-2015 The Rust Project Developers. See the COPYRIGHT
+// Copyright 2016 The Rust Project Developers. See the COPYRIGHT
 // file at the top-level directory of this distribution and at
 // http://rust-lang.org/COPYRIGHT.
 //
@@ -10,6 +10,8 @@
 
 // Code for testing annotated snippets.
 
+#![cfg(test)]
+
 use codemap::{BytePos, CodeMap, FileMap, NO_EXPANSION, Span};
 use std::rc::Rc;
 use super::{RenderedLine, SnippetData};