---

yaml
---
r: 277564
b: refs/heads/try
c: 9355a91
h: refs/heads/master

Author: nikomatsakis

[refs]

@@ -1,7 +1,7 @@
 ---
 refs/heads/master: 6dbb0e86aec11050480beb76eade6fb805010ba7
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
-refs/heads/try: db8a9a92b3dafcd5a8d7207096c8cbb90db0b013
+refs/heads/try: 9355a91224a6f715b94342c074e5bac1f9e820f3
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105
 refs/tags/release-0.2: c870d2dffb391e14efb05aa27898f1f6333a9596
 refs/tags/release-0.3: b5f0d0f648d9a6153664837026ba1be43d3e2503

branches/try/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(""),