nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-26 00:34:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify source_string and block-format methods

Browse Source
This commit is contained in:
Philipp Hansch 2019-06-03 07:38:19 +02:00
parent 94c8aa6791
commit 4a6b91cd66
No known key found for this signature in database
GPG Key ID: 82AA61CAA11397E6
1 changed files with 13 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
src/librustc_errors/annotate_rs_emitter.rs
View File

@ -138,13 +138,11 @@ impl<'a> DiagnosticConverter<'a> {
}
/// Provides the source string for the given `line` of `file`
fn source_string(file: Lrc<SourceFile>,
line: &Line) -> String {
let source_string = match file.get_line(line.line_index - 1) {
Some(s) => s.clone(),
None => return String::new(),
};
source_string.to_string()
fn source_string(
file: Lrc<SourceFile>,
line: &Line
) -> String {
file.get_line(line.line_index - 1).map(|a| a.to_string()).unwrap_or(String::new())
}
/// Maps `Diagnostic::Level` to `snippet::AnnotationType`
@ -184,13 +182,14 @@ impl AnnotateRsEmitterWriter {
self
}
fn emit_messages_default(&mut self,
level: &Level,
message: String,
code: &Option<DiagnosticId>,
msp: &MultiSpan,
children: &[SubDiagnostic],
suggestions: &[CodeSuggestion]
fn emit_messages_default(
&mut self,
level: &Level,
message: String,
code: &Option<DiagnosticId>,
msp: &MultiSpan,
children: &[SubDiagnostic],
suggestions: &[CodeSuggestion]
) {
let converter = DiagnosticConverter {
source_map: self.source_map.clone(),