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

Manishearth · web-flow · commit bd2b3e79d96e · 2019-10-02T15:38:52.000-07:00
Compare `primary` with maximum of `children`s' line num instead of dropping it Fix #65001.
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

Original file line number	Diff line number	Diff line change
`@@ -1026,7 +1026,8 @@ impl EmitterWriter {`
`1026`	`1026`	`children.iter()`
`1027`	`1027`	`.map(\|sub\| self.get_multispan_max_line_num(&sub.span))`
`1028`	`1028`	`.max()`
`1029`		`- .unwrap_or(primary)`
	`1029`	`+ .unwrap_or(0)`
	`1030`	`+ .max(primary)`
`1030`	`1031`	`}`
`1031`	`1032`
`1032`	`1033`	`/// Adds a left margin to every line but the first, given a padding length and the label being`