---

yaml
---
r: 277953
b: refs/heads/auto
c: 9d151a7
h: refs/heads/master
i:
  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: f359aa276216aa74868b4ead5fea9a83a8397b27
+refs/heads/auto: 9d151a71c032b655ca457521730044237c9e130e
 refs/tags/release-0.6: b4ebcfa1812664df5e142f0134a5faea3918544c
 refs/tags/0.1: b19db808c2793fe2976759b85a355c3ad8c8b336
 refs/tags/0.2: 1754d02027f2924bed83b0160ee340c7f41d5ea1

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

@@ -475,30 +475,34 @@ impl FileInfo {
             while let Some(line) = next_line {
                 if line.annotations.is_empty() { break; }
 
-                let mut rendered_line = self.render_line(line);
+                let mut rendered_lines = self.render_line(line);
+                assert!(!rendered_lines.is_empty());
                 if old_school {
                     match self.primary_span {
                         Some(span) => {
                             let lo = codemap.lookup_char_pos(span.lo);
-                            rendered_line[0].text.insert(0, StyledString {
+                            rendered_lines[0].text.insert(0, StyledString {
                                 text: format!(":{} ", lo.line),
                                 style: Style::LineAndColumn,
                             });
-                            rendered_line[0].text.insert(0, StyledString {
+                            rendered_lines[0].text.insert(0, StyledString {
                                 text: lo.file.name.clone(),
                                 style: Style::FileNameStyle,
                             });
-                            let gap_amount = rendered_line[0].text[0].text.len() +
-                                rendered_line[0].text[1].text.len();
-                            rendered_line[1].text.insert(0, StyledString {
-                                text: vec![" "; gap_amount].join(""),
-                                style: Style::NoStyle
-                            });
+                            let gap_amount =
+                                rendered_lines[0].text[0].text.len() +
+                                rendered_lines[0].text[1].text.len();
+                            for i in 1..rendered_lines.len() {
+                                rendered_lines[i].text.insert(0, StyledString {
+                                    text: vec![" "; gap_amount].join(""),
+                                    style: Style::NoStyle
+                                });
+                            }
                         }
                         _ =>()
                     }
                 }
-                output.append(&mut rendered_line);
+                output.append(&mut rendered_lines);
                 next_line = lines_iter.next();
             }