---

yaml
---
r: 276159
b: refs/heads/master
c: e56121c
h: refs/heads/master
i:
  276157: 83e0df9
  276155: c588d1b
  276151: b0575dc
  276143: 88e5ffa
  276127: 95c7e04
  276095: bed1301

Author: nikomatsakis

[refs]

@@ -1,5 +1,5 @@
 ---
-refs/heads/master: 9a9c9afbe265b1fc9dbb1ed8bdb9b82523badf9c
+refs/heads/master: e56121c584893d8b46af5e4cd5d580d30f221d9f
 refs/heads/snap-stage3: 235d77457d80b549dad3ac36d94f235208a1eafb
 refs/heads/try: 49312a405e14a449b98fe0056b12a40ac128be4a
 refs/tags/release-0.1: 1f5c5126e96c79d22cb7862f75304136e204f105

trunk/src/libsyntax/errors/snippet/mod.rs

@@ -103,7 +103,7 @@ pub enum RenderedLineKind {
     Annotations,
     Elision,
 }
-use self::RenderedLineKind::*;
+use self::RenderedLineKind as RLK;
 
 impl SnippetData {
     pub fn new(codemap: Rc<CodeMap>,
@@ -244,19 +244,19 @@ impl RenderedLine {
 impl RenderedLineKind {
     fn prefix(&self) -> StyledString {
         match *self {
-            SourceText { file: _, line_index } =>
+            RLK::SourceText { file: _, line_index } =>
                 StyledString {
                     text: format!("{}", line_index + 1),
                     style: LineNumber,
                 },
-            Elision =>
+            RLK::Elision =>
                 StyledString {
                     text: String::from("..."),
                     style: LineNumber,
                 },
-            PrimaryFileName |
-            OtherFileName |
-            Annotations =>
+            RLK::PrimaryFileName |
+            RLK::OtherFileName |
+            RLK::Annotations =>
                 StyledString {
                     text: String::from(""),
                     style: LineNumber,
@@ -296,7 +296,7 @@ impl StyledBuffer {
                 //We know our first output line is source and the rest are highlights and labels
                 output.push(RenderedLine { text: styled_vec, kind: source_kind.clone() });
             } else {
-                output.push(RenderedLine { text: styled_vec, kind: Annotations });
+                output.push(RenderedLine { text: styled_vec, kind: RLK::Annotations });
             }
             styled_vec = vec![];
         }
@@ -484,7 +484,7 @@ impl FileInfo {
                         text: format!(":{}:{}", lo.line, lo.col.0 + 1),
                         style: LineAndColumn,
                     }],
-                    kind: PrimaryFileName,
+                    kind: RLK::PrimaryFileName,
                 });
             }
             None => {
@@ -493,7 +493,7 @@ impl FileInfo {
                         text: self.file.name.clone(),
                         style: FileNameStyle,
                     }],
-                    kind: OtherFileName,
+                    kind: RLK::OtherFileName,
                 });
             }
         }
@@ -534,7 +534,7 @@ impl FileInfo {
                     if prev_ends_at_eol && is_single_unlabeled_annotated_line {
                         if !elide_unlabeled_region {
                             output.push(RenderedLine::from((String::new(),
-                                NoStyle, Elision)));
+                                NoStyle, RLK::Elision)));
                             elide_unlabeled_region = true;
                             prev_ends_at_eol = true;
                         }
@@ -548,7 +548,7 @@ impl FileInfo {
                 }
             } else {
                 if group.len() > 1 {
-                    output.push(RenderedLine::from((String::new(), NoStyle, Elision)));
+                    output.push(RenderedLine::from((String::new(), NoStyle, RLK::Elision)));
                 } else {
                     let mut v: Vec<RenderedLine> =
                         group.iter().flat_map(|line| self.render_line(line)).collect();
@@ -563,7 +563,7 @@ impl FileInfo {
     fn render_line(&self, line: &Line) -> Vec<RenderedLine> {
         let source_string = self.file.get_line(line.line_index)
                                      .unwrap_or("");
-        let source_kind = SourceText {
+        let source_kind = RLK::SourceText {
             file: self.file.clone(),
             line_index: line.line_index,
         };