diff options
| author | Niko Matsakis <niko@alum.mit.edu> | 2016-04-26 12:53:20 -0400 |
|---|---|---|
| committer | Niko Matsakis <niko@alum.mit.edu> | 2016-05-02 11:49:24 -0400 |
| commit | d5529f000da43fe2e9f2aad03f747b0144da9354 (patch) | |
| tree | 0a3e4a6f28cd0fe62c749539ddacdc529a880b04 /src/libsyntax/errors/snippet/mod.rs | |
| parent | d58a4becf3943c02b9815f3d3875fe8817e41c7b (diff) | |
| download | rust-d5529f000da43fe2e9f2aad03f747b0144da9354.tar.gz rust-d5529f000da43fe2e9f2aad03f747b0144da9354.zip | |
Nit: do not use RLK
Diffstat (limited to 'src/libsyntax/errors/snippet/mod.rs')
| -rw-r--r-- | src/libsyntax/errors/snippet/mod.rs | 26 |
1 files changed, 14 insertions, 12 deletions
diff --git a/src/libsyntax/errors/snippet/mod.rs b/src/libsyntax/errors/snippet/mod.rs index f86d4bdb147..4d9a3eb2486 100644 --- a/src/libsyntax/errors/snippet/mod.rs +++ b/src/libsyntax/errors/snippet/mod.rs @@ -102,7 +102,6 @@ pub enum RenderedLineKind { Annotations, Elision, } -use self::RenderedLineKind as RLK; impl SnippetData { pub fn new(codemap: Rc<CodeMap>, @@ -243,19 +242,19 @@ impl RenderedLine { impl RenderedLineKind { fn prefix(&self) -> StyledString { match *self { - RLK::SourceText { file: _, line_index } => + RenderedLineKind::SourceText { file: _, line_index } => StyledString { text: format!("{}", line_index + 1), style: Style::LineNumber, }, - RLK::Elision => + RenderedLineKind::Elision => StyledString { text: String::from("..."), style: Style::LineNumber, }, - RLK::PrimaryFileName | - RLK::OtherFileName | - RLK::Annotations => + RenderedLineKind::PrimaryFileName | + RenderedLineKind::OtherFileName | + RenderedLineKind::Annotations => StyledString { text: String::from(""), style: Style::LineNumber, @@ -295,7 +294,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: RLK::Annotations }); + output.push(RenderedLine { text: styled_vec, kind: RenderedLineKind::Annotations }); } styled_vec = vec![]; } @@ -483,7 +482,7 @@ impl FileInfo { text: format!(":{}:{}", lo.line, lo.col.0 + 1), style: Style::LineAndColumn, }], - kind: RLK::PrimaryFileName, + kind: RenderedLineKind::PrimaryFileName, }); } None => { @@ -492,7 +491,7 @@ impl FileInfo { text: self.file.name.clone(), style: Style::FileNameStyle, }], - kind: RLK::OtherFileName, + kind: RenderedLineKind::OtherFileName, }); } } @@ -533,7 +532,8 @@ impl FileInfo { if prev_ends_at_eol && is_single_unlabeled_annotated_line { if !elide_unlabeled_region { output.push(RenderedLine::from((String::new(), - Style::NoStyle, RLK::Elision))); + Style::NoStyle, + RenderedLineKind::Elision))); elide_unlabeled_region = true; prev_ends_at_eol = true; } @@ -547,7 +547,9 @@ impl FileInfo { } } else { if group.len() > 1 { - output.push(RenderedLine::from((String::new(), Style::NoStyle, RLK::Elision))); + output.push(RenderedLine::from((String::new(), + Style::NoStyle, + RenderedLineKind::Elision))); } else { let mut v: Vec<RenderedLine> = group.iter().flat_map(|line| self.render_line(line)).collect(); @@ -562,7 +564,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 = RLK::SourceText { + let source_kind = RenderedLineKind::SourceText { file: self.file.clone(), line_index: line.line_index, }; |
