user0/rust
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

fix: Add col separator before secondary messages with no source

Browse source
This commit is contained in:
Scott Schafer 2025-07-03 15:47:15 -06:00
parent 8835ea854e
commit 93d16c5100
No known key found for this signature in database
40 changed files with 87 additions and 0 deletions
Download patch file Download diff file Expand all files Collapse all files

25
compiler/rustc_errors/src/emitter.rs
View file

@ -1591,6 +1591,9 @@ impl HumanEmitter {
annotated_files.swap(0, pos);
}
// An end column separator should be emitted when a file with with a
// source, is followed by one without a source
let mut col_sep_before_no_show_source = false;
let annotated_files_len = annotated_files.len();
// Print out the annotate source lines that correspond with the error
for (file_idx, annotated_file) in annotated_files.into_iter().enumerate() {
@ -1601,6 +1604,26 @@ impl HumanEmitter {
&annotated_file.file,
) {
if !self.short_message {
// Add an end column separator when a file without a source
// comes after one with a source
// ╭▸ $DIR/deriving-meta-unknown-trait.rs:1:10
// │
// LL │ #[derive(Eqr)]
// │ ━━━
// ╰╴ (<- It prints *this* line)
// ╭▸ $SRC_DIR/core/src/cmp.rs:356:0
// │
// ╰╴note: similarly named derive macro `Eq` defined here
if col_sep_before_no_show_source {
let buffer_msg_line_offset = buffer.num_lines();
self.draw_col_separator_end(
&mut buffer,
buffer_msg_line_offset,
max_line_num_len + 1,
);
}
col_sep_before_no_show_source = false;
// We'll just print an unannotated message.
for (annotation_id, line) in annotated_file.lines.iter().enumerate() {
let mut annotations = line.annotations.clone();
@ -1671,6 +1694,8 @@ impl HumanEmitter {
}
}
continue;
} else {
col_sep_before_no_show_source = true;
}
// print out the span location and spacer before we print the annotated source

1
tests/ui/async-await/in-trait/dont-project-to-specializable-projection.stderr
View file

@ -25,6 +25,7 @@ error[E0599]: no method named `poll` found for struct `Pin<&mut impl Future<Outp
|
LL | match fut.as_mut().poll(ctx) {
| ^^^^ method not found in `Pin<&mut impl Future<Output = ()>>`
|
--> $SRC_DIR/core/src/future/future.rs:LL:COL
|
= note: the method is available for `Pin<&mut impl Future<Output = ()>>` here

1
tests/ui/c-variadic/issue-86053-1.stderr
View file

@ -57,6 +57,7 @@ error[E0412]: cannot find type `F` in this scope
|
LL | self , ... , self , self , ... ) where F : FnOnce ( & 'a & 'b usize ) {
| ^
|
--> $SRC_DIR/core/src/ops/function.rs:LL:COL
|
= note: similarly named trait `Fn` defined here

1
tests/ui/closures/issue-78720.stderr
View file

@ -9,6 +9,7 @@ error[E0412]: cannot find type `F` in this scope
|
LL | _func: F,
| ^
|
--> $SRC_DIR/core/src/ops/function.rs:LL:COL
|
= note: similarly named trait `Fn` defined here

1
tests/ui/closures/issue-90871.stderr
View file

@ -3,6 +3,7 @@ error[E0412]: cannot find type `n` in this scope
|
LL | type_ascribe!(2, n([u8; || 1]))
| ^ help: a trait with a similar name exists: `Fn`
|
--> $SRC_DIR/core/src/ops/function.rs:LL:COL
|
= note: similarly named trait `Fn` defined here

1
tests/ui/const-generics/generic_const_exprs/expected-type-of-closure-body-to-be-a-closure-or-coroutine-ice-113776.stderr
View file

@ -3,6 +3,7 @@ error[E0412]: cannot find type `F` in this scope
|
LL | let f: F = async { 1 };
| ^
|
--> $SRC_DIR/core/src/ops/function.rs:LL:COL
|
= note: similarly named trait `Fn` defined here

1
tests/ui/consts/issue-89088.stderr
View file

@ -6,6 +6,7 @@ LL | const FOO: &A = &A::Field(Cow::Borrowed("foo"));
...
LL | FOO => todo!(),
| ^^^ constant of non-structural type
|
--> $SRC_DIR/alloc/src/borrow.rs:LL:COL
|
= note: `Cow<'_, str>` must be annotated with `#[derive(PartialEq)]` to be usable in patterns

2
tests/ui/derives/deriving-meta-unknown-trait.stderr
View file

@ -3,6 +3,7 @@ error: cannot find derive macro `Eqr` in this scope
|
LL | #[derive(Eqr)]
| ^^^ help: a derive macro with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named derive macro `Eq` defined here
@ -12,6 +13,7 @@ error: cannot find derive macro `Eqr` in this scope
|
LL | #[derive(Eqr)]
| ^^^ help: a derive macro with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named derive macro `Eq` defined here

1
tests/ui/did_you_mean/println-typo.stderr
View file

@ -3,6 +3,7 @@ error: cannot find macro `prinltn` in this scope
|
LL | prinltn!();
| ^^^^^^^ help: a macro with a similar name exists: `println`
|
--> $SRC_DIR/std/src/macros.rs:LL:COL
|
= note: similarly named macro `println` defined here

1
tests/ui/impl-trait/call_method_without_import.no_import.stderr
View file

@ -3,6 +3,7 @@ error[E0599]: no method named `fmt` found for opaque type `impl Debug` in the cu
|
LL | x.fmt(f);
| ^^^ method not found in `impl Debug`
|
--> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
|
= note: the method is available for `impl Debug` here

1
tests/ui/impl-trait/impl-generic-mismatch.stderr
View file

@ -48,6 +48,7 @@ error[E0643]: method `hash` has incompatible signature for trait
|
LL | fn hash(&self, hasher: &mut impl Hasher) {}
| ^^^^^^^^^^^ expected generic parameter, found `impl Trait`
|
--> $SRC_DIR/core/src/hash/mod.rs:LL:COL
|
= note: declaration in trait here

4
tests/ui/imports/suggest-remove-issue-121315.stderr
View file

@ -3,6 +3,7 @@ error: the item `TryFrom` is imported redundantly
|
LL | use std::convert::TryFrom;
| ^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `TryFrom` is already defined here
@ -17,6 +18,7 @@ error: the item `TryFrom` is imported redundantly
|
LL | use std::convert::{TryFrom, TryInto};
| ^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `TryFrom` is already defined here
@ -26,6 +28,7 @@ error: the item `TryInto` is imported redundantly
|
LL | use std::convert::{TryFrom, TryInto};
| ^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `TryInto` is already defined here
@ -47,6 +50,7 @@ error: the item `Into` is imported redundantly
|
LL | use std::convert::{AsMut, Into};
| ^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `Into` is already defined here

2
tests/ui/issues/issue-17546.stderr
View file

@ -3,6 +3,7 @@ error[E0573]: expected type, found variant `NoResult`
|
LL | fn new() -> NoResult<MyEnum, String> {
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/core/src/result.rs:LL:COL
|
= note: similarly named enum `Result` defined here
@ -56,6 +57,7 @@ error[E0573]: expected type, found variant `NoResult`
|
LL | fn newer() -> NoResult<foo::MyEnum, String> {
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/core/src/result.rs:LL:COL
|
= note: similarly named enum `Result` defined here

1
tests/ui/issues/issue-27033.stderr
View file

@ -3,6 +3,7 @@ error[E0530]: match bindings cannot shadow unit variants
|
LL | None @ _ => {}
| ^^^^ cannot be named the same as a unit variant
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the unit variant `None` is defined here

1
tests/ui/lint/use-redundant/use-redundant-issue-71450.stderr
View file

@ -3,6 +3,7 @@ warning: the item `String` is imported redundantly
|
LL | use std::string::String;
| ^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `String` is already defined here

4
tests/ui/lint/use-redundant/use-redundant-prelude-rust-2015.stderr
View file

@ -3,6 +3,7 @@ warning: the item `Some` is imported redundantly
|
LL | use std::option::Option::Some;
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `Some` is already defined here
@ -17,6 +18,7 @@ warning: the item `None` is imported redundantly
|
LL | use std::option::Option::None;
| ^^^^^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `None` is already defined here
@ -26,6 +28,7 @@ warning: the item `Ok` is imported redundantly
|
LL | use std::result::Result::Ok;
| ^^^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `Ok` is already defined here
@ -35,6 +38,7 @@ warning: the item `Err` is imported redundantly
|
LL | use std::result::Result::Err;
| ^^^^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `Err` is already defined here

2
tests/ui/lint/use-redundant/use-redundant-prelude-rust-2021.stderr
View file

@ -3,6 +3,7 @@ warning: the item `TryFrom` is imported redundantly
|
LL | use std::convert::TryFrom;
| ^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `TryFrom` is already defined here
@ -17,6 +18,7 @@ warning: the item `TryInto` is imported redundantly
|
LL | use std::convert::TryInto;
| ^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/prelude/mod.rs:LL:COL
|
= note: the item `TryInto` is already defined here

1
tests/ui/macros/macro-name-typo.stderr
View file

@ -3,6 +3,7 @@ error: cannot find macro `printlx` in this scope
|
LL | printlx!("oh noes!");
| ^^^^^^^ help: a macro with a similar name exists: `println`
|
--> $SRC_DIR/std/src/macros.rs:LL:COL
|
= note: similarly named macro `println` defined here

1
tests/ui/macros/macro-path-prelude-fail-3.stderr
View file

@ -3,6 +3,7 @@ error: cannot find macro `inline` in this scope
|
LL | inline!();
| ^^^^^^ help: a macro with a similar name exists: `line`
|
--> $SRC_DIR/core/src/macros/mod.rs:LL:COL
|
= note: similarly named macro `line` defined here

1
tests/ui/macros/missing-writer-issue-139830.stderr
View file

@ -3,6 +3,7 @@ error[E0599]: cannot write into `String`
|
LL | let _ = write!(buf, "foo");
| ^^^
|
--> $SRC_DIR/core/src/fmt/mod.rs:LL:COL
|
= note: the method is available for `String` here

1
tests/ui/methods/method-call-lifetime-args-unresolved.stderr
View file

@ -14,6 +14,7 @@ warning: cannot specify lifetime arguments explicitly if late bound lifetime par
|
LL | 0.clone::<'a>();
| ^^
|
--> $SRC_DIR/core/src/clone.rs:LL:COL
|
= note: the late bound lifetime parameter is introduced here

1
tests/ui/parser/misspelled-keywords/ref.stderr
View file

@ -15,6 +15,7 @@ error[E0023]: this pattern has 2 fields, but the corresponding tuple variant has
|
LL | Some(refe list) => println!("{list:?}"),
| ^^^^ ^^^^ expected 1 field, found 2
|
--> $SRC_DIR/core/src/option.rs:LL:COL
|
= note: tuple variant has 1 field

1
tests/ui/parser/recover/recover-pat-exprs.stderr
View file

@ -690,6 +690,7 @@ error: expected one of `)`, `,`, `@`, `if`, or `|`, found `*`
|
LL | let b = matches!(x, (x * x | x.f()) | x[0]);
| ^ expected one of `)`, `,`, `@`, `if`, or `|`
|
--> $SRC_DIR/core/src/macros/mod.rs:LL:COL
|
= note: while parsing argument for this `pat` macro fragment

1
tests/ui/pattern/deref-patterns/implicit-const-deref.stderr
View file

@ -6,6 +6,7 @@ LL | const EMPTY: Vec<()> = Vec::new();
...
LL | EMPTY => {}
| ^^^^^ constant of non-structural type
|
--> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
|
= note: `Vec<()>` must be annotated with `#[derive(PartialEq)]` to be usable in patterns

1
tests/ui/pattern/issue-115599.stderr
View file

@ -6,6 +6,7 @@ LL | const CONST_STRING: String = String::new();
...
LL | if let CONST_STRING = empty_str {}
| ^^^^^^^^^^^^ constant of non-structural type
|
--> $SRC_DIR/alloc/src/vec/mod.rs:LL:COL
|
= note: `Vec<u8>` must be annotated with `#[derive(PartialEq)]` to be usable in patterns

1
tests/ui/privacy/suggest-box-new.stderr
View file

@ -3,6 +3,7 @@ error[E0423]: expected function, tuple struct or tuple variant, found struct `st
|
LL | let _ = std::collections::HashMap();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
|
= note: `std::collections::HashMap` defined here

3
tests/ui/proc-macro/parent-source-spans.stderr
View file

@ -144,6 +144,7 @@ LL | parent_source_spans!($($tokens)*);
...
LL | one!("hello", "world");
| ---------------------- in this macro invocation
|
--> $SRC_DIR/core/src/result.rs:LL:COL
|
= note: similarly named tuple variant `Ok` defined here
@ -158,6 +159,7 @@ LL | parent_source_spans!($($tokens)*);
...
LL | two!("yay", "rust");
| ------------------- in this macro invocation
|
--> $SRC_DIR/core/src/result.rs:LL:COL
|
= note: similarly named tuple variant `Ok` defined here
@ -172,6 +174,7 @@ LL | parent_source_spans!($($tokens)*);
...
LL | three!("hip", "hop");
| -------------------- in this macro invocation
|
--> $SRC_DIR/core/src/result.rs:LL:COL
|
= note: similarly named tuple variant `Ok` defined here

2
tests/ui/proc-macro/resolve-error.stderr
View file

@ -76,6 +76,7 @@ error: cannot find derive macro `Dlone` in this scope
|
LL | #[derive(Dlone)]
| ^^^^^ help: a derive macro with a similar name exists: `Clone`
|
--> $SRC_DIR/core/src/clone.rs:LL:COL
|
= note: similarly named derive macro `Clone` defined here
@ -85,6 +86,7 @@ error: cannot find derive macro `Dlone` in this scope
|
LL | #[derive(Dlone)]
| ^^^^^ help: a derive macro with a similar name exists: `Clone`
|
--> $SRC_DIR/core/src/clone.rs:LL:COL
|
= note: similarly named derive macro `Clone` defined here

1
tests/ui/resolve/levenshtein.stderr
View file

@ -18,6 +18,7 @@ error[E0412]: cannot find type `Opiton` in this scope
|
LL | type B = Opiton<u8>; // Misspelled type name from the prelude.
| ^^^^^^ help: an enum with a similar name exists: `Option`
|
--> $SRC_DIR/core/src/option.rs:LL:COL
|
= note: similarly named enum `Option` defined here

1
tests/ui/suggestions/attribute-typos.stderr
View file

@ -15,6 +15,7 @@ error: cannot find attribute `tests` in this scope
|
LL | #[tests]
| ^^^^^ help: an attribute macro with a similar name exists: `test`
|
--> $SRC_DIR/core/src/macros/mod.rs:LL:COL
|
= note: similarly named attribute macro `test` defined here

1
tests/ui/suggestions/do-not-attempt-to-add-suggestions-with-no-changes.stderr
View file

@ -3,6 +3,7 @@ error[E0573]: expected type, found module `result`
|
LL | impl result {
| ^^^^^^ help: an enum with a similar name exists: `Result`
|
--> $SRC_DIR/core/src/result.rs:LL:COL
|
= note: similarly named enum `Result` defined here

1
tests/ui/suggestions/enum-method-probe.stderr
View file

@ -99,6 +99,7 @@ error[E0624]: method `len` is private
|
LL | res.len();
| ^^^ private method
|
--> $SRC_DIR/core/src/option.rs:LL:COL
|
= note: private method defined here

1
tests/ui/suggestions/import-trait-for-method-call.stderr
View file

@ -3,6 +3,7 @@ error[E0599]: no method named `finish` found for struct `DefaultHasher` in the c
|
LL | h.finish()
| ^^^^^^ method not found in `DefaultHasher`
|
--> $SRC_DIR/core/src/hash/mod.rs:LL:COL
|
= note: the method is available for `DefaultHasher` here

1
tests/ui/suggestions/multi-suggestion.ascii.stderr
View file

@ -3,6 +3,7 @@ error[E0423]: expected function, tuple struct or tuple variant, found struct `st
|
LL | let _ = std::collections::HashMap();
| ^^^^^^^^^^^^^^^^^^^^^^^^^^^
|
--> $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
|
= note: `std::collections::HashMap` defined here

1
tests/ui/suggestions/multi-suggestion.unicode.stderr
View file

@ -3,6 +3,7 @@ error[E0423]: expected function, tuple struct or tuple variant, found struct `st
│
LL │ let _ = std::collections::HashMap();
│ ━━━━━━━━━━━━━━━━━━━━━━━━━━━
╰╴
╭▸ $SRC_DIR/std/src/collections/hash/map.rs:LL:COL
│
╰ note: `std::collections::HashMap` defined here

1
tests/ui/suggestions/suggest-tryinto-edition-change.stderr
View file

@ -44,6 +44,7 @@ error[E0599]: no method named `try_into` found for type `i32` in the current sco
|
LL | let _i: i16 = 0_i32.try_into().unwrap();
| ^^^^^^^^
|
--> $SRC_DIR/core/src/convert/mod.rs:LL:COL
|
= note: the method is available for `i32` here

5
tests/ui/traits/associated_type_bound/assoc_type_bound_with_struct.stderr
View file

@ -3,6 +3,7 @@ error[E0404]: expected trait, found struct `String`
|
LL | struct Foo<T> where T: Bar, <T as Bar>::Baz: String {
| ^^^^^^ not a trait
|
--> $SRC_DIR/alloc/src/string.rs:LL:COL
|
= note: similarly named trait `ToString` defined here
@ -21,6 +22,7 @@ error[E0404]: expected trait, found struct `String`
|
LL | struct Qux<'a, T> where T: Bar, <&'a T as Bar>::Baz: String {
| ^^^^^^ not a trait
|
--> $SRC_DIR/alloc/src/string.rs:LL:COL
|
= note: similarly named trait `ToString` defined here
@ -39,6 +41,7 @@ error[E0404]: expected trait, found struct `String`
|
LL | fn foo<T: Bar>(_: T) where <T as Bar>::Baz: String {
| ^^^^^^ not a trait
|
--> $SRC_DIR/alloc/src/string.rs:LL:COL
|
= note: similarly named trait `ToString` defined here
@ -57,6 +60,7 @@ error[E0404]: expected trait, found struct `String`
|
LL | fn qux<'a, T: Bar>(_: &'a T) where <&'a T as Bar>::Baz: String {
| ^^^^^^ not a trait
|
--> $SRC_DIR/alloc/src/string.rs:LL:COL
|
= note: similarly named trait `ToString` defined here
@ -81,6 +85,7 @@ error[E0404]: expected trait, found struct `String`
|
LL | fn issue_95327() where <u8 as Unresolved>::Assoc: String {}
| ^^^^^^ help: a trait with a similar name exists: `ToString`
|
--> $SRC_DIR/alloc/src/string.rs:LL:COL
|
= note: similarly named trait `ToString` defined here

1
tests/ui/type/issue-7607-1.stderr
View file

@ -3,6 +3,7 @@ error[E0412]: cannot find type `Fo` in this scope
|
LL | impl Fo {
| ^^ help: a trait with a similar name exists: `Fn`
|
--> $SRC_DIR/core/src/ops/function.rs:LL:COL
|
= note: similarly named trait `Fn` defined here

1
tests/ui/typeck/issue-83693.stderr
View file

@ -3,6 +3,7 @@ error[E0412]: cannot find type `F` in this scope
|
LL | impl F {
| ^ help: a trait with a similar name exists: `Fn`
|
--> $SRC_DIR/core/src/ops/function.rs:LL:COL
|
= note: similarly named trait `Fn` defined here

8
tests/ui/ufcs/ufcs-partially-resolved.stderr
View file

@ -12,6 +12,7 @@ error[E0404]: expected trait, found enum `E`
|
LL | let _: <u8 as E>::N;
| ^ help: a trait with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named trait `Eq` defined here
@ -42,6 +43,7 @@ error[E0404]: expected trait, found enum `E`
|
LL | <u8 as E>::N;
| ^ help: a trait with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named trait `Eq` defined here
@ -63,6 +65,7 @@ error[E0404]: expected trait, found enum `E`
|
LL | let _: <u8 as E>::Y;
| ^ help: a trait with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named trait `Eq` defined here
@ -72,6 +75,7 @@ error[E0404]: expected trait, found enum `E`
|
LL | <u8 as E>::Y;
| ^ help: a trait with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named trait `Eq` defined here
@ -90,6 +94,7 @@ error[E0404]: expected trait, found enum `E`
|
LL | let _: <u8 as E>::N::NN;
| ^ help: a trait with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named trait `Eq` defined here
@ -120,6 +125,7 @@ error[E0404]: expected trait, found enum `E`
|
LL | <u8 as E>::N::NN;
| ^ help: a trait with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named trait `Eq` defined here
@ -141,6 +147,7 @@ error[E0404]: expected trait, found enum `E`
|
LL | let _: <u8 as E>::Y::NN;
| ^ help: a trait with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named trait `Eq` defined here
@ -150,6 +157,7 @@ error[E0404]: expected trait, found enum `E`
|
LL | <u8 as E>::Y::NN;
| ^ help: a trait with a similar name exists: `Eq`
|
--> $SRC_DIR/core/src/cmp.rs:LL:COL
|
= note: similarly named trait `Eq` defined here