Skip to content

Commit

Permalink
Rollup merge of rust-lang#64721 - hman523:issue64447, r=estebank
Browse files Browse the repository at this point in the history
Fixed issue from rust-lang#64447

Did two tiny fixes. One is a micro optimization since we know that max is going to be assigned a `usize`, we do not have to worry about a possible negative number.
The other issue that was fixed is that the max from the children isn't updated correctly. Now it will use `sub_result` instead of `primary` and will properly get the needed value.
  • Loading branch information
Centril committed Sep 24, 2019
2 parents e861424 + a6da0e9 commit bea1933
Showing 1 changed file with 2 additions and 3 deletions.
5 changes: 2 additions & 3 deletions src/librustc_errors/emitter.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1043,14 +1043,13 @@ impl EmitterWriter {
}

fn get_max_line_num(&mut self, span: &MultiSpan, children: &[SubDiagnostic]) -> usize {
let mut max = 0;

let primary = self.get_multispan_max_line_num(span);
max = if primary > max { primary } else { max };
let mut max = primary;

for sub in children {
let sub_result = self.get_multispan_max_line_num(&sub.span);
max = if sub_result > max { primary } else { max };
max = std::cmp::max(sub_result, max);
}
max
}
Expand Down

0 comments on commit bea1933

Please sign in to comment.