bjoernager/rust
bjoernager/rust
1
Fork 0
Code Activity

Simplify EmitterWriter::get_multispan_max_line_num

Browse source
This commit is contained in:
AnthonyMikh 2019-09-30 23:43:24 +03:00 • committed by GitHub
parent 7dc953b493
commit 6b6a79b190
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 16 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

32
src/librustc_errors/emitter.rs
View file

@ -997,27 +997,27 @@ impl EmitterWriter {
} }
fn get_multispan_max_line_num(&mut self, msp: &MultiSpan) -> usize { fn get_multispan_max_line_num(&mut self, msp: &MultiSpan) -> usize {
let sm = match self.sm {
Some(ref sm) => sm,
None => return 0,
};
let mut max = 0; let mut max = 0;
if let Some(ref sm) = self.sm { for primary_span in msp.primary_spans() {
for primary_span in msp.primary_spans() { if !primary_span.is_dummy() {
if !primary_span.is_dummy() { let hi = sm.lookup_char_pos(primary_span.hi());
let hi = sm.lookup_char_pos(primary_span.hi()); max = max(max, hi.line);
if hi.line > max {
max = hi.line;
}
}
} }
if !self.short_message { }
for span_label in msp.span_labels() { if !self.short_message {
if !span_label.span.is_dummy() { for span_label in msp.span_labels() {
let hi = sm.lookup_char_pos(span_label.span.hi()); if !span_label.span.is_dummy() {
if hi.line > max { let hi = sm.lookup_char_pos(span_label.span.hi());
max = hi.line; max = max(max, hi.line);
}
}
} }
} }
} }
max max
} }