---

yaml
---
r: 277955
b: refs/heads/auto
c: 9355a91
h: refs/heads/master
i:
  277953: 0761467
  277951: dec61fc

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: db8a9a92b3dafcd5a8d7207096c8cbb90db0b013
+refs/heads/auto: 9355a91224a6f715b94342c074e5bac1f9e820f3
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

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

@@ -38,13 +38,13 @@ pub struct FileInfo {
     lines: Vec<Line>,
 }
 
-#[derive(Clone)]
+#[derive(Clone, Debug)]
 struct Line {
     line_index: usize,
     annotations: Vec<Annotation>,
 }
 
-#[derive(Clone, PartialOrd, Ord, PartialEq, Eq)]
+#[derive(Clone, Debug, PartialOrd, Ord, PartialEq, Eq)]
 struct Annotation {
     /// Start column, 0-based indexing -- counting *characters*, not
     /// utf-8 bytes. Note that it is important that this field goes
@@ -492,6 +492,9 @@ impl FileInfo {
                             let gap_amount =
                                 rendered_lines[0].text[0].text.len() +
                                 rendered_lines[0].text[1].text.len();
+                            assert!(rendered_lines.len() >= 2,
+                                    "no annotations resulted from: {:?}",
+                                    line);
                             for i in 1..rendered_lines.len() {
                                 rendered_lines[i].text.insert(0, StyledString {
                                     text: vec![" "; gap_amount].join(""),