rust-bors · Nov 12, 2026 · Oct 19, 2026 · Nov 11, 2026 · Oct 17, 2026 · estebank
diff --git a/Cargo.lock b/Cargo.lock
@@ -64,9 +64,9 @@ dependencies = [
 
 [[package]]
 name = "annotate-snippets"
-version = "0.12.16"
+version = "0.12.18"
 source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "f211a51805bc641f3ad5b7664c77d2547af685cc33b4cd8d31964027a46f13f1"
+checksum = "0258346f92c78dbc5b336b9a5b27c64447aa10643bc64e651db2edb145361564"
 dependencies = [
  "anstyle",
  "memchr",
@@ -680,7 +680,7 @@ dependencies = [
 name = "clippy-dev"
 version = "0.0.1"
 dependencies = [
- "annotate-snippets 0.12.16",
+ "annotate-snippets 0.12.18",
  "anstream 0.6.21",
  "chrono",
  "clap",
@@ -4041,7 +4041,7 @@ dependencies = [
 name = "rustc_errors"
 version = "0.0.0"
 dependencies = [
- "annotate-snippets 0.12.16",
+ "annotate-snippets 0.12.18",
  "anstream 0.6.21",
  "anstyle",
  "derive_setters",
@@ -5179,7 +5179,7 @@ dependencies = [
 name = "rustfmt-nightly"
 version = "1.12.0"
 dependencies = [
- "annotate-snippets 0.12.16",
+ "annotate-snippets 0.12.18",
  "anyhow",
  "bytecount",
  "cargo_metadata 0.23.1",

diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml
@@ -5,7 +5,7 @@ edition = "2024"
 
 [dependencies]
 # tidy-alphabetical-start
-annotate-snippets = { version = "0.12.16", features = ["simd"] }
+annotate-snippets = { version = "0.12.18", features = ["simd"] }
 anstream = "0.6.20"
 anstyle = "1.0.13"
 derive_setters = "0.1.6"

diff --git a/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs b/compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs
@@ -45,6 +45,7 @@ pub struct AnnotateSnippetEmitter {
     track_diagnostics: bool,
     terminal_url: TerminalUrl,
     theme: OutputTheme,
+    no_graphics: bool,
 }
 
 impl Debug for AnnotateSnippetEmitter {
@@ -60,6 +61,7 @@ impl Debug for AnnotateSnippetEmitter {
             track_diagnostics,
             terminal_url,
             theme,
+            no_graphics,
         } = self;
 
         f.debug_struct("AnnotateSnippetEmitter")
@@ -73,6 +75,7 @@ impl Debug for AnnotateSnippetEmitter {
             .field("track_diagnostics", track_diagnostics)
             .field("terminal_url", terminal_url)
             .field("theme", theme)
+            .field("no_graphics", no_graphics)
             .finish()
     }
 }
@@ -153,6 +156,7 @@ impl AnnotateSnippetEmitter {
             track_diagnostics: false,
             terminal_url: TerminalUrl::No,
             theme: OutputTheme::Ascii,
+            no_graphics: false,
         }
     }
 
@@ -540,9 +544,10 @@ impl AnnotateSnippetEmitter {
             ColorChoice::Never => Renderer::plain(),
         }
         .term_width(width)
-        .anonymized_line_numbers(self.ui_testing)
+        .anonymized_snippet_line_numbers(self.ui_testing)
         .decor_style(decor_style)
         .short_message(self.short_message)
+        .no_graphics(self.no_graphics)
     }
 
     fn pre_style_msgs(&self, msgs: &[(DiagMessage, Style)], args: &DiagArgMap) -> String {

diff --git a/compiler/rustc_errors/src/emitter.rs b/compiler/rustc_errors/src/emitter.rs
@@ -33,6 +33,7 @@ use crate::{
 /// Describes the way the content of the `rendered` field of the json output is generated
 #[derive(Clone, Copy, Debug, PartialEq, Eq)]
 pub struct HumanReadableErrorType {
+    pub no_graphics: bool,
     pub short: bool,
     pub unicode: bool,
 }

diff --git a/compiler/rustc_errors/src/json.rs b/compiler/rustc_errors/src/json.rs
@@ -362,6 +362,7 @@ impl Diagnostic {
             .ui_testing(je.ui_testing)
             .ignored_directories_in_source_blocks(je.ignored_directories_in_source_blocks.clone())
             .theme(if je.json_rendered.unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
+            .no_graphics(je.json_rendered.no_graphics)
             .emit_diagnostic(diag);
 
         let buf = Arc::try_unwrap(buf.0).unwrap().into_inner().unwrap();

diff --git a/compiler/rustc_errors/src/json/tests.rs b/compiler/rustc_errors/src/json/tests.rs
@@ -51,7 +51,7 @@ fn test_positions(code: &str, span: (u32, u32), expected_output: SpanTestData) {
             Box::new(Shared { data: output.clone() }),
             Some(sm),
             true, // pretty
-            HumanReadableErrorType { short: true, unicode: false },
+            HumanReadableErrorType { no_graphics: false, short: true, unicode: false },
             ColorConfig::Never,
         );
 

diff --git a/compiler/rustc_interface/src/tests.rs b/compiler/rustc_interface/src/tests.rs
@@ -346,7 +346,7 @@ fn test_search_paths_tracking_hash_different_order() {
     let early_dcx = EarlyDiagCtxt::new(JSON);
     const JSON: ErrorOutputType = ErrorOutputType::Json {
         pretty: false,
-        json_rendered: HumanReadableErrorType { short: false, unicode: false },
+        json_rendered: HumanReadableErrorType { no_graphics: false, short: false, unicode: false },
         color_config: ColorConfig::Never,
     };
 

diff --git a/compiler/rustc_parse/src/parser/tests.rs b/compiler/rustc_parse/src/parser/tests.rs
@@ -309,7 +309,7 @@ error: foo
   │
 2 │   fn foo() {
   │ ┏━━━━━━━━━━┛
-  ‡ ┃
+  ┆ ┇
 5 │ ┃   }
   ╰╴┗━━━┛ test
 
@@ -2126,7 +2126,7 @@ error: foo
  5 │  │ 1
  6 │  │ 2
  7 │  │ 3
-   ‡  │
+   ┆  ┆
 15 │  │   X2 Y2 Z2
 16 │  │   X3 Y3 Z3
    ╰╴ └──────────┘ `Y` is a good letter too
@@ -2207,7 +2207,7 @@ error: foo
 10 │ ┃│ 6
 11 │ ┃│   X2 Y2 Z2
    │ ┃└──────────┘ `Z` is a good letter too
-   ‡ ┃
+   ┆ ┇
 15 │ ┃  10
 16 │ ┃    X3 Y3 Z3
    ╰╴┗━━━━━━━━┛ `Y` is a good letter

diff --git a/compiler/rustc_session/src/config.rs b/compiler/rustc_session/src/config.rs
@@ -887,7 +887,7 @@ pub enum ErrorOutputType {
     /// Output meant for the consumption of humans.
     #[default]
     HumanReadable {
-        kind: HumanReadableErrorType = HumanReadableErrorType { short: false, unicode: false },
+        kind: HumanReadableErrorType = HumanReadableErrorType { no_graphics: false, short: false, unicode: false },
         color_config: ColorConfig = ColorConfig::Auto,
     },
     /// Output that's consumed by other tools such as `rustfix` or the `RLS`.
@@ -2337,7 +2337,8 @@ impl JsonUnusedExterns {
 /// The first value returned is how to render JSON diagnostics, and the second
 /// is whether or not artifact notifications are enabled.
 pub fn parse_json(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches) -> JsonConfig {
-    let mut json_rendered = HumanReadableErrorType { short: false, unicode: false };
+    let mut json_rendered =
+        HumanReadableErrorType { no_graphics: false, short: false, unicode: false };
     let mut json_color = ColorConfig::Never;
     let mut json_artifact_notifications = false;
     let mut json_unused_externs = JsonUnusedExterns::No;
@@ -2354,10 +2355,16 @@ pub fn parse_json(early_dcx: &EarlyDiagCtxt, matches: &getopts::Matches) -> Json
         for sub_option in option.split(',') {
             match sub_option {
                 "diagnostic-short" => {
-                    json_rendered = HumanReadableErrorType { short: true, unicode: false };
+                    json_rendered =
+                        HumanReadableErrorType { no_graphics: false, short: true, unicode: false };
+                }
+                "diagnostic-no-graphics" => {
+                    json_rendered =
+                        HumanReadableErrorType { no_graphics: true, short: false, unicode: false };
                 }
                 "diagnostic-unicode" => {
-                    json_rendered = HumanReadableErrorType { short: false, unicode: true };
+                    json_rendered =
+                        HumanReadableErrorType { no_graphics: false, short: false, unicode: true };
                 }
                 "diagnostic-rendered-ansi" => json_color = ColorConfig::Always,
                 "artifacts" => json_artifact_notifications = true,
@@ -2388,7 +2395,7 @@ pub fn parse_error_format(
     json_color: ColorConfig,
     json_rendered: HumanReadableErrorType,
 ) -> ErrorOutputType {
-    let default_kind = HumanReadableErrorType { short: false, unicode: false };
+    let default_kind = HumanReadableErrorType { no_graphics: false, short: false, unicode: false };
     // We need the `opts_present` check because the driver will send us Matches
     // with only stable options if no unstable options are used. Since error-format
     // is unstable, it will not be present. We have to use `opts_present` not
@@ -2405,11 +2412,15 @@ pub fn parse_error_format(
                 ErrorOutputType::Json { pretty: true, json_rendered, color_config: json_color }
             }
             Some("short") => ErrorOutputType::HumanReadable {
-                kind: HumanReadableErrorType { short: true, unicode: false },
+                kind: HumanReadableErrorType { no_graphics: false, short: true, unicode: false },
+                color_config,
+            },
+            Some("human-no-graphics") => ErrorOutputType::HumanReadable {
+                kind: HumanReadableErrorType { no_graphics: true, short: false, unicode: false },
                 color_config,
             },
             Some("human-unicode") => ErrorOutputType::HumanReadable {
-                kind: HumanReadableErrorType { short: false, unicode: true },
+                kind: HumanReadableErrorType { no_graphics: false, short: false, unicode: true },
                 color_config,
             },
             Some(arg) => {
@@ -2418,8 +2429,8 @@ pub fn parse_error_format(
                     kind: default_kind,
                 });
                 early_dcx.early_fatal(format!(
-                    "argument for `--error-format` must be `human`, `human-unicode`, \
-                    `json`, `pretty-json` or `short` (instead was `{arg}`)"
+                    "argument for `--error-format` must be `human`, `human-no-graphics`, \
+                    `human-unicode`, `json`, `pretty-json` or `short` (instead was `{arg}`)"
                 ))
             }
         }
@@ -2494,6 +2505,7 @@ fn check_error_format_stability(
     let format = match format {
         ErrorOutputType::Json { pretty: true, .. } => "pretty-json",
         ErrorOutputType::HumanReadable { kind, .. } => match kind {
+            HumanReadableErrorType { no_graphics: true, .. } => "human-no-graphics",
             HumanReadableErrorType { unicode: true, .. } => "human-unicode",
             _ => return,
         },

diff --git a/compiler/rustc_session/src/session.rs b/compiler/rustc_session/src/session.rs
@@ -1310,7 +1310,7 @@ fn default_emitter(sopts: &config::Options, source_map: Arc<SourceMap>) -> Box<D
 
     match sopts.error_format {
         config::ErrorOutputType::HumanReadable { kind, color_config } => match kind {
-            HumanReadableErrorType { short, unicode } => {
+            HumanReadableErrorType { no_graphics, short, unicode } => {
                 let emitter = AnnotateSnippetEmitter::new(stderr_destination(color_config))
                     .sm(source_map)
                     .short_message(short)
@@ -1321,7 +1321,8 @@ fn default_emitter(sopts: &config::Options, source_map: Arc<SourceMap>) -> Box<D
                     .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
                     .ignored_directories_in_source_blocks(
                         sopts.unstable_opts.ignore_directory_in_diagnostics_source_blocks.clone(),
-                    );
+                    )
+                    .no_graphics(no_graphics);
                 Box::new(emitter.ui_testing(sopts.unstable_opts.ui_testing))
             }
         },
@@ -1963,10 +1964,11 @@ impl EarlyDiagCtxt {
 fn mk_emitter(output: ErrorOutputType) -> Box<DynEmitter> {
     let emitter: Box<DynEmitter> = match output {
         config::ErrorOutputType::HumanReadable { kind, color_config } => match kind {
-            HumanReadableErrorType { short, unicode } => Box::new(
+            HumanReadableErrorType { no_graphics, short, unicode } => Box::new(
                 AnnotateSnippetEmitter::new(stderr_destination(color_config))
                     .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
-                    .short_message(short),
+                    .short_message(short)
+                    .no_graphics(no_graphics),
             ),
         },
         config::ErrorOutputType::Json { pretty, json_rendered, color_config } => {

diff --git a/src/librustdoc/core.rs b/src/librustdoc/core.rs
@@ -172,14 +172,15 @@ pub(crate) fn new_dcx(
 ) -> rustc_errors::DiagCtxt {
     let emitter: Box<DynEmitter> = match error_format {
         ErrorOutputType::HumanReadable { kind, color_config } => match kind {
-            HumanReadableErrorType { short, unicode } => Box::new(
+            HumanReadableErrorType { no_graphics, short, unicode } => Box::new(
                 AnnotateSnippetEmitter::new(stderr_destination(color_config))
                     .sm(source_map.map(|sm| sm as _))
                     .short_message(short)
                     .diagnostic_width(diagnostic_width)
                     .track_diagnostics(unstable_opts.track_diagnostics)
                     .theme(if unicode { OutputTheme::Unicode } else { OutputTheme::Ascii })
-                    .ui_testing(unstable_opts.ui_testing),
+                    .ui_testing(unstable_opts.ui_testing)
+                    .no_graphics(no_graphics),
             ),
         },
         ErrorOutputType::Json { pretty, json_rendered, color_config } => {

diff --git a/src/librustdoc/doctest.rs b/src/librustdoc/doctest.rs
@@ -648,9 +648,12 @@ fn run_test(
         },
     ]);
     if let ErrorOutputType::HumanReadable { kind, color_config } = rustdoc_options.error_format {
-        let short = kind.short();
-        let unicode = kind == HumanReadableErrorType { unicode: true, short };
+        let HumanReadableErrorType { no_graphics, short, unicode } = kind;
 
+        if no_graphics {
+            compiler_args
+                .extend_from_slice(&["--error-format".to_owned(), "human-no-graphics".to_owned()]);
+        }
         if short {
             compiler_args.extend_from_slice(&["--error-format".to_owned(), "short".to_owned()]);
         }

diff --git a/src/tools/compiletest/src/common.rs b/src/tools/compiletest/src/common.rs
@@ -1282,7 +1282,6 @@ pub(crate) fn expected_output_path(
 pub(crate) const UI_EXTENSIONS: &[&str] = &[
     UI_STDERR,
     UI_SVG,
-    UI_WINDOWS_SVG,
     UI_STDOUT,
     UI_FIXED,
     UI_RUN_STDERR,
@@ -1295,7 +1294,6 @@ pub(crate) const UI_EXTENSIONS: &[&str] = &[
 ];
 pub(crate) const UI_STDERR: &str = "stderr";
 pub(crate) const UI_SVG: &str = "svg";
-pub(crate) const UI_WINDOWS_SVG: &str = "windows.svg";
 pub(crate) const UI_STDOUT: &str = "stdout";
 pub(crate) const UI_FIXED: &str = "fixed";
 pub(crate) const UI_RUN_STDERR: &str = "run.stderr";

diff --git a/src/tools/compiletest/src/runtest.rs b/src/tools/compiletest/src/runtest.rs
@@ -16,7 +16,7 @@ use tracing::*;
 use crate::common::{
     CompareMode, Config, Debugger, ForcePassMode, PassFailMode, RunResult, TestMode, TestPaths,
     TestSuite, UI_EXTENSIONS, UI_FIXED, UI_RUN_STDERR, UI_RUN_STDOUT, UI_STDERR, UI_STDOUT, UI_SVG,
-    UI_WINDOWS_SVG, expected_output_path, incremental_dir, output_base_dir, output_base_name,
+    expected_output_path, incremental_dir, output_base_dir, output_base_name,
 };
 use crate::directives::{AuxCrate, TestProps};
 use crate::edition::Edition;
@@ -2465,13 +2465,7 @@ impl<'test> TestCx<'test> {
         let (stderr_kind, stdout_kind) = match output_kind {
             TestOutput::Compile => (
                 if self.force_color_svg() {
-                    if self.config.target.contains("windows") {
-                        // We single out Windows here because some of the CLI coloring is
-                        // specifically changed for Windows.
-                        UI_WINDOWS_SVG
-                    } else {
-                        UI_SVG
-                    }
+                    UI_SVG
                 } else if self.props.stderr_per_bitwidth {
                     &stderr_bits
                 } else {

diff --git a/tests/run-make/jobserver-error/cannot_open_fd.stderr b/tests/run-make/jobserver-error/cannot_open_fd.stderr
@@ -1,6 +1,6 @@
 warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--jobserver-auth=1000,1000"`: cannot open file descriptor 1000 from the jobserver environment variable value: Bad file descriptor (os error 9)
-  |
-  = note: the build environment is likely misconfigured
+ |
+ = note: the build environment is likely misconfigured
 
 error: no input filename given
 

diff --git a/tests/run-make/jobserver-error/not_a_pipe.stderr b/tests/run-make/jobserver-error/not_a_pipe.stderr
@@ -1,4 +1,4 @@
 warning: failed to connect to jobserver from environment variable `MAKEFLAGS="--jobserver-auth=3,3"`: file descriptor 3 from the jobserver environment variable value is not a pipe
-  |
-  = note: the build environment is likely misconfigured
+ |
+ = note: the build environment is likely misconfigured
 
diff --git a/tests/run-make/linker-warning/deny-linker-lint.txt b/tests/run-make/linker-warning/deny-linker-lint.txt
@@ -1,6 +1,6 @@
 error: linker stderr: bar
-  |
-  = note: requested on the command line with `-D linker-messages`
+ |
+ = note: requested on the command line with `-D linker-messages`
 
 error: aborting due to 1 previous error
 
diff --git a/tests/run-make/linker-warning/deny-warnings.txt b/tests/run-make/linker-warning/deny-warnings.txt
@@ -1,7 +1,7 @@
 warning: linker stderr: bar
-  |
-  = note: requested on the command line with `-W linker-messages`
-  = note: the `linker_messages` lint ignores `-D warnings`
+ |
+ = note: requested on the command line with `-W linker-messages`
+ = note: the `linker_messages` lint ignores `-D warnings`
 
 warning: 1 warning emitted
 
diff --git a/tests/run-make/linker-warning/short-error.txt b/tests/run-make/linker-warning/short-error.txt
@@ -1,9 +1,9 @@
 error: linking with `./fake-linker` failed: exit status: 1
-  |
-  = note:  "./fake-linker" "-m64" "/symbols.o" "<2 object files omitted>" "-Wl,--as-needed" "-Wl,-Bstatic" "/build-root/test/run-make/linker-warning/rmake_out/{libfoo,libbar}.rlib" "<sysroot>/lib/rustlib/x86_64-unknown-linux-gnu/lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libcfg_if-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,liblibc-*,librustc_std_workspace_core-*,liballoc-*,libcore-*,libcompiler_builtins-*}.rlib" "-Wl,-Bdynamic" "-lgcc_s" "-lutil" "-lrt" "-lpthread" "-lm" "-ldl" "-lc" "-L" "/raw-dylibs" "-Wl,--eh-frame-hdr" "-Wl,-z,noexecstack" "-L" "/build-root/test/run-make/linker-warning/rmake_out" "-L" "<sysroot>/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-o" "main" "-Wl,--gc-sections" "-pie" "-Wl,-z,relro,-z,now" "-nodefaultlibs" "run_make_error"
-  = note: some arguments are omitted. use `--verbose` to show all linker arguments
-  = note: error: baz
-          
+ |
+ = note:  "./fake-linker" "-m64" "/symbols.o" "<2 object files omitted>" "-Wl,--as-needed" "-Wl,-Bstatic" "/build-root/test/run-make/linker-warning/rmake_out/{libfoo,libbar}.rlib" "<sysroot>/lib/rustlib/x86_64-unknown-linux-gnu/lib/{libstd-*,libpanic_unwind-*,libobject-*,libmemchr-*,libaddr2line-*,libgimli-*,libcfg_if-*,librustc_demangle-*,libstd_detect-*,libhashbrown-*,librustc_std_workspace_alloc-*,libminiz_oxide-*,libadler2-*,libunwind-*,liblibc-*,librustc_std_workspace_core-*,liballoc-*,libcore-*,libcompiler_builtins-*}.rlib" "-Wl,-Bdynamic" "-lgcc_s" "-lutil" "-lrt" "-lpthread" "-lm" "-ldl" "-lc" "-L" "/raw-dylibs" "-Wl,--eh-frame-hdr" "-Wl,-z,noexecstack" "-L" "/build-root/test/run-make/linker-warning/rmake_out" "-L" "<sysroot>/lib/rustlib/x86_64-unknown-linux-gnu/lib" "-o" "main" "-Wl,--gc-sections" "-pie" "-Wl,-z,relro,-z,now" "-nodefaultlibs" "run_make_error"
+ = note: some arguments are omitted. use `--verbose` to show all linker arguments
+ = note: error: baz
+
 
 error: aborting due to 1 previous error