From e1d3ad89c7a2ad4f5d944a7fee1298ffe8c99645 Mon Sep 17 00:00:00 2001
From: Jana Dönszelmann <jana@donsz.nl>
Date: Thu, 31 Jul 2025 11:00:40 +0200
Subject: remove rustc_attr_data_structures

---
 compiler/rustc_errors/src/diagnostic_impls.rs | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'compiler/rustc_errors/src')

diff --git a/compiler/rustc_errors/src/diagnostic_impls.rs b/compiler/rustc_errors/src/diagnostic_impls.rs
index eeb9ac28808..eca5806fac5 100644
--- a/compiler/rustc_errors/src/diagnostic_impls.rs
+++ b/compiler/rustc_errors/src/diagnostic_impls.rs
@@ -8,7 +8,7 @@ use std::process::ExitStatus;
 use rustc_abi::TargetDataLayoutErrors;
 use rustc_ast::util::parser::ExprPrecedence;
 use rustc_ast_pretty::pprust;
-use rustc_attr_data_structures::RustcVersion;
+use rustc_hir::RustcVersion;
 use rustc_macros::Subdiagnostic;
 use rustc_span::edition::Edition;
 use rustc_span::{Ident, MacroRulesNormalizedIdent, Span, Symbol};
-- 
cgit 1.4.1-3-g733a5


From 935fdb6980f0f4133a26a91aefe81b4e2cea01c9 Mon Sep 17 00:00:00 2001
From: Scott Schafer <schaferjscott@gmail.com>
Date: Tue, 29 Jul 2025 03:41:09 -0600
Subject: fix: Match width of ascii and unicode secondary file start

---
 compiler/rustc_errors/src/emitter.rs               | 2 +-
 tests/ui/error-emitter/close_window.unicode.stderr | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

(limited to 'compiler/rustc_errors/src')

diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs
index 3fe525df94f..8794bf930fd 100644
--- a/compiler/rustc_errors/src/emitter.rs
+++ b/compiler/rustc_errors/src/emitter.rs
@@ -2988,7 +2988,7 @@ impl HumanEmitter {
     fn secondary_file_start(&self) -> &'static str {
         match self.theme {
             OutputTheme::Ascii => "::: ",
-            OutputTheme::Unicode => " ⸬ ",
+            OutputTheme::Unicode => " ⸬  ",
         }
     }
 
diff --git a/tests/ui/error-emitter/close_window.unicode.stderr b/tests/ui/error-emitter/close_window.unicode.stderr
index 56ab6daa278..b4aa78a5ac9 100644
--- a/tests/ui/error-emitter/close_window.unicode.stderr
+++ b/tests/ui/error-emitter/close_window.unicode.stderr
@@ -4,7 +4,7 @@ error[E0624]: method `method` is private
 LL │     s.method();
    │       ━━━━━━ private method
    │
-   ⸬ $DIR/auxiliary/close_window.rs:3:5
+   ⸬  $DIR/auxiliary/close_window.rs:3:5
    │
 LL │     fn method(&self) {}
    ╰╴    ──────────────── private method defined here
-- 
cgit 1.4.1-3-g733a5