Rollup merge of rust-lang#65010 - AnthonyMikh:fix_65001, r=estebank

Compare `primary` with maximum of `children`s' line num instead of dropping it Fix rust-lang#65001.
tmandry · Oct 3, 2019 · d5a0765 · d5a0765
2 parents 4ea2be7 + df203a2
commit d5a0765
Showing 1 changed file with 2 additions and 1 deletion.
diff --git a/src/librustc_errors/emitter.rs b/src/librustc_errors/emitter.rs
@@ -1026,7 +1026,8 @@ impl EmitterWriter {
         children.iter()
             .map(|sub| self.get_multispan_max_line_num(&sub.span))
             .max()
-            .unwrap_or(primary)
+            .unwrap_or(0)
+            .max(primary)
     }
 
     /// Adds a left margin to every line but the first, given a padding length and the label being