Skip to content

Commit bc678f2

Browse files
authored
Unrolled build for #144733
Rollup merge of #144733 - Muscraft:secondary-file-sigil, r=compiler-errors fix: Match width of ascii and unicode secondary file start The current [unicode secondary file start](https://github.com/rust-lang/rust/blob/64ca23b6235732fa61c0a2b957c5d7e591e7c972/compiler/rustc_errors/src/emitter.rs#L2991) is only three characters, whereas the ASCII variant and normal [file start](https://github.com/rust-lang/rust/blob/64ca23b6235732fa61c0a2b957c5d7e591e7c972/compiler/rustc_errors/src/emitter.rs#L2983-L2984) are four characters. This slight difference caused the paths following a Unicode secondary file start to not align with other structured elements.
2 parents 3fb1b53 + 935fdb6 commit bc678f2

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

compiler/rustc_errors/src/emitter.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2988,7 +2988,7 @@ impl HumanEmitter {
29882988
fn secondary_file_start(&self) -> &'static str {
29892989
match self.theme {
29902990
OutputTheme::Ascii => "::: ",
2991-
OutputTheme::Unicode => " ⸬ ",
2991+
OutputTheme::Unicode => " ⸬ ",
29922992
}
29932993
}
29942994

tests/ui/error-emitter/close_window.unicode.stderr

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@ error[E0624]: method `method` is private
44
LL │ s.method();
55
│ ━━━━━━ private method
66
7-
⸬ $DIR/auxiliary/close_window.rs:3:5
7+
$DIR/auxiliary/close_window.rs:3:5
88
99
LL │ fn method(&self) {}
1010
╰╴ ──────────────── private method defined here

0 commit comments

Comments
 (0)