From 7b4c5c62aaa86301c2f358623bf3bfee39e7beef Mon Sep 17 00:00:00 2001 From: AnthonyMikh Date: Mon, 30 Sep 2019 23:47:51 +0300 Subject: Simplify `EmitterWriter::get_max_line_num` --- src/librustc_errors/emitter.rs | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) (limited to 'src/librustc_errors') diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs index 1d060ff1338..6727f276759 100644 --- a/src/librustc_errors/emitter.rs +++ b/src/librustc_errors/emitter.rs @@ -1022,15 +1022,11 @@ impl EmitterWriter { } fn get_max_line_num(&mut self, span: &MultiSpan, children: &[SubDiagnostic]) -> usize { - let primary = self.get_multispan_max_line_num(span); - let mut max = primary; - - for sub in children { - let sub_result = self.get_multispan_max_line_num(&sub.span); - max = std::cmp::max(sub_result, max); - } - max + children.iter() + .map(|sub| self.get_multispan_max_line_num(&sub.span)) + .max() + .unwrap_or(primary) } /// Adds a left margin to every line but the first, given a padding length and the label being -- cgit 1.4.1-3-g733a5