fix: Only show one origin for multiline annotations with no source

Muscraft · Muscraft · commit 66111184402a · 2025-11-18T10:57:31.000-07:00
diff --git a/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs b/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs
@@ -633,7 +633,7 @@ impl AnnotateSnippetEmitter {
                     report.push(std::mem::replace(&mut group, Group::with_level(level.clone())));
                 }
 
-                if !line_tracker.contains(&lo.line) {
+                if !line_tracker.contains(&lo.line) && (i == 0 || hi.line <= lo.line) {
                     line_tracker.push(lo.line);
                     // ╭▸ $SRC_DIR/core/src/option.rs:594:0 (<- It adds *this*)
                     // ⸬  $SRC_DIR/core/src/option.rs:602:4
diff --git a/tests/ui/typeck/typeck_type_placeholder_item.stderr b/tests/ui/typeck/typeck_type_placeholder_item.stderr
@@ -688,7 +688,6 @@ note: method `filter` is not const because trait `Iterator` is not const
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
    |
    = note: this trait is not const
-  ::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
   ::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
    |
    = note: this method is not const
@@ -704,7 +703,6 @@ note: method `map` is not const because trait `Iterator` is not const
   --> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
    |
    = note: this trait is not const
-  ::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
   ::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL
    |
    = note: this method is not const

Original file line number	Diff line number	Diff line change
`@@ -633,7 +633,7 @@ impl AnnotateSnippetEmitter {`
`633`	`633`	`report.push(std::mem::replace(&mut group, Group::with_level(level.clone())));`
`634`	`634`	`}`
`635`	`635`
`636`		`- if !line_tracker.contains(&lo.line) {`
	`636`	`+ if !line_tracker.contains(&lo.line) && (i == 0 \|\| hi.line <= lo.line) {`
`637`	`637`	`line_tracker.push(lo.line);`
`638`	`638`	`// ╭▸ $SRC_DIR/core/src/option.rs:594:0 (<- It adds this)`
`639`	`639`	`// ⸬ $SRC_DIR/core/src/option.rs:602:4`
Original file line number	Diff line number	Diff line change
@@ -688,7 +688,6 @@ note: method `filter` is not const because trait `Iterator` is not const
`688`	`688`	`--> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL`
`689`	`689`	`\|`
`690`	`690`	`= note: this trait is not const`
`691`		`- ::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL`
`692`	`691`	`::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL`
`693`	`692`	`\|`
`694`	`693`	`= note: this method is not const`
@@ -704,7 +703,6 @@ note: method `map` is not const because trait `Iterator` is not const
`704`	`703`	`--> $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL`
`705`	`704`	`\|`
`706`	`705`	`= note: this trait is not const`
`707`		`- ::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL`
`708`	`706`	`::: $SRC_DIR/core/src/iter/traits/iterator.rs:LL:COL`
`709`	`707`	`\|`
`710`	`708`	`= note: this method is not const`