From 170dc19509ea482934b17d6e1edee942d1d2a6b9 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 23 Oct 2025 13:06:16 -0700 Subject: [PATCH 1/3] Update codespan-reporting to pull in ?Sized fix --- gen/build/Cargo.toml | 2 +- gen/cmd/Cargo.toml | 2 +- gen/lib/Cargo.toml | 2 +- third-party/BUCK | 16 ++++++++-------- third-party/Cargo.lock | 4 ++-- third-party/Cargo.toml | 2 +- third-party/bazel/BUILD.bazel | 6 +++--- ...zel => BUILD.codespan-reporting-0.13.1.bazel} | 2 +- third-party/bazel/defs.bzl | 14 +++++++------- 9 files changed, 25 insertions(+), 25 deletions(-) rename third-party/bazel/{BUILD.codespan-reporting-0.13.0.bazel => BUILD.codespan-reporting-0.13.1.bazel} (99%) diff --git a/gen/build/Cargo.toml b/gen/build/Cargo.toml index e7c2c093d..e242939f3 100644 --- a/gen/build/Cargo.toml +++ b/gen/build/Cargo.toml @@ -18,7 +18,7 @@ parallel = ["cc/parallel"] [dependencies] cc = "1.0.101" -codespan-reporting = "0.13" +codespan-reporting = "0.13.1" indexmap = "2.9.0" proc-macro2 = { version = "1.0.74", default-features = false, features = ["span-locations"] } quote = { version = "1.0.35", default-features = false } diff --git a/gen/cmd/Cargo.toml b/gen/cmd/Cargo.toml index 3022d41c0..e9b44f549 100644 --- a/gen/cmd/Cargo.toml +++ b/gen/cmd/Cargo.toml @@ -18,7 +18,7 @@ path = "src/main.rs" [dependencies] clap = { version = "4.3.11", default-features = false, features = ["error-context", "help", "std", "suggestions", "usage"] } -codespan-reporting = "0.13" +codespan-reporting = "0.13.1" indexmap = "2.9.0" proc-macro2 = { version = "1.0.74", default-features = false, features = ["span-locations"] } quote = { version = "1.0.35", default-features = false } diff --git a/gen/lib/Cargo.toml b/gen/lib/Cargo.toml index 86ffe4730..a94a5ccc6 100644 --- a/gen/lib/Cargo.toml +++ b/gen/lib/Cargo.toml @@ -13,7 +13,7 @@ repository = "https://github.com/dtolnay/cxx" rust-version = "1.87" [dependencies] -codespan-reporting = "0.13" +codespan-reporting = "0.13.1" indexmap = "2.9.0" proc-macro2 = { version = "1.0.74", default-features = false, features = ["span-locations"] } quote = { version = "1.0.35", default-features = false } diff --git a/third-party/BUCK b/third-party/BUCK index 0c1a1a236..894c8c195 100644 --- a/third-party/BUCK +++ b/third-party/BUCK @@ -127,23 +127,23 @@ cargo.rust_library( alias( name = "codespan-reporting", - actual = ":codespan-reporting-0.13.0", + actual = ":codespan-reporting-0.13.1", visibility = ["PUBLIC"], ) http_archive( - name = "codespan-reporting-0.13.0.crate", - sha256 = "ba7a06c0b31fff5ff2e1e7d37dbf940864e2a974b336e1a2938d10af6e8fb283", - strip_prefix = "codespan-reporting-0.13.0", - urls = ["https://static.crates.io/crates/codespan-reporting/0.13.0/download"], + name = "codespan-reporting-0.13.1.crate", + sha256 = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681", + strip_prefix = "codespan-reporting-0.13.1", + urls = ["https://static.crates.io/crates/codespan-reporting/0.13.1/download"], visibility = [], ) cargo.rust_library( - name = "codespan-reporting-0.13.0", - srcs = [":codespan-reporting-0.13.0.crate"], + name = "codespan-reporting-0.13.1", + srcs = [":codespan-reporting-0.13.1.crate"], crate = "codespan_reporting", - crate_root = "codespan-reporting-0.13.0.crate/src/lib.rs", + crate_root = "codespan-reporting-0.13.1.crate/src/lib.rs", edition = "2021", features = [ "default", diff --git a/third-party/Cargo.lock b/third-party/Cargo.lock index 6f1829bd0..80dbcd647 100644 --- a/third-party/Cargo.lock +++ b/third-party/Cargo.lock @@ -45,9 +45,9 @@ checksum = "a1d728cc89cf3aee9ff92b05e62b19ee65a02b5702cff7d5a377e32c6ae29d8d" [[package]] name = "codespan-reporting" -version = "0.13.0" +version = "0.13.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ba7a06c0b31fff5ff2e1e7d37dbf940864e2a974b336e1a2938d10af6e8fb283" +checksum = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681" dependencies = [ "serde", "termcolor", diff --git a/third-party/Cargo.toml b/third-party/Cargo.toml index f5d9b109a..308b678ce 100644 --- a/third-party/Cargo.toml +++ b/third-party/Cargo.toml @@ -9,7 +9,7 @@ rust-version = "1.87" [dependencies] cc = "1.0.101" clap = { version = "4", default-features = false, features = ["error-context", "help", "std", "usage"] } -codespan-reporting = "0.13" +codespan-reporting = "0.13.1" foldhash = "0.2" indexmap = "2.9.0" proc-macro2 = { version = "1.0.58", features = ["span-locations"] } diff --git a/third-party/bazel/BUILD.bazel b/third-party/bazel/BUILD.bazel index a3bb6d863..cade0473c 100644 --- a/third-party/bazel/BUILD.bazel +++ b/third-party/bazel/BUILD.bazel @@ -56,14 +56,14 @@ alias( ) alias( - name = "codespan-reporting-0.13.0", - actual = "@vendor__codespan-reporting-0.13.0//:codespan_reporting", + name = "codespan-reporting-0.13.1", + actual = "@vendor__codespan-reporting-0.13.1//:codespan_reporting", tags = ["manual"], ) alias( name = "codespan-reporting", - actual = "@vendor__codespan-reporting-0.13.0//:codespan_reporting", + actual = "@vendor__codespan-reporting-0.13.1//:codespan_reporting", tags = ["manual"], ) diff --git a/third-party/bazel/BUILD.codespan-reporting-0.13.0.bazel b/third-party/bazel/BUILD.codespan-reporting-0.13.1.bazel similarity index 99% rename from third-party/bazel/BUILD.codespan-reporting-0.13.0.bazel rename to third-party/bazel/BUILD.codespan-reporting-0.13.1.bazel index 49401c8f5..631a6713a 100644 --- a/third-party/bazel/BUILD.codespan-reporting-0.13.0.bazel +++ b/third-party/bazel/BUILD.codespan-reporting-0.13.1.bazel @@ -97,7 +97,7 @@ rust_library( "@rules_rust//rust/platform:x86_64-unknown-uefi": [], "//conditions:default": ["@platforms//:incompatible"], }), - version = "0.13.0", + version = "0.13.1", deps = [ "@vendor__termcolor-1.4.1//:termcolor", "@vendor__unicode-width-0.2.2//:unicode_width", diff --git a/third-party/bazel/defs.bzl b/third-party/bazel/defs.bzl index 78e972548..ccac7d38f 100644 --- a/third-party/bazel/defs.bzl +++ b/third-party/bazel/defs.bzl @@ -297,7 +297,7 @@ _NORMAL_DEPENDENCIES = { _COMMON_CONDITION: { "cc": Label("@vendor//:cc-1.2.41"), "clap": Label("@vendor//:clap-4.5.49"), - "codespan-reporting": Label("@vendor//:codespan-reporting-0.13.0"), + "codespan-reporting": Label("@vendor//:codespan-reporting-0.13.1"), "foldhash": Label("@vendor//:foldhash-0.2.0"), "indexmap": Label("@vendor//:indexmap-2.11.4"), "proc-macro2": Label("@vendor//:proc-macro2-1.0.101"), @@ -474,12 +474,12 @@ def crate_repositories(): maybe( http_archive, - name = "vendor__codespan-reporting-0.13.0", - sha256 = "ba7a06c0b31fff5ff2e1e7d37dbf940864e2a974b336e1a2938d10af6e8fb283", + name = "vendor__codespan-reporting-0.13.1", + sha256 = "af491d569909a7e4dee0ad7db7f5341fef5c614d5b8ec8cf765732aba3cff681", type = "tar.gz", - urls = ["https://static.crates.io/crates/codespan-reporting/0.13.0/download"], - strip_prefix = "codespan-reporting-0.13.0", - build_file = Label("//third-party/bazel:BUILD.codespan-reporting-0.13.0.bazel"), + urls = ["https://static.crates.io/crates/codespan-reporting/0.13.1/download"], + strip_prefix = "codespan-reporting-0.13.1", + build_file = Label("//third-party/bazel:BUILD.codespan-reporting-0.13.1.bazel"), ) maybe( @@ -685,7 +685,7 @@ def crate_repositories(): return [ struct(repo = "vendor__cc-1.2.41", is_dev_dep = False), struct(repo = "vendor__clap-4.5.49", is_dev_dep = False), - struct(repo = "vendor__codespan-reporting-0.13.0", is_dev_dep = False), + struct(repo = "vendor__codespan-reporting-0.13.1", is_dev_dep = False), struct(repo = "vendor__foldhash-0.2.0", is_dev_dep = False), struct(repo = "vendor__indexmap-2.11.4", is_dev_dep = False), struct(repo = "vendor__proc-macro2-1.0.101", is_dev_dep = False), From 5193523ac68bb2150a3cba67a775b6bf845ccbc4 Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 23 Oct 2025 13:11:15 -0700 Subject: [PATCH 2/3] Instantiate emit_to_write_style with dynamically sized writer --- gen/src/error.rs | 9 ++------- 1 file changed, 2 insertions(+), 7 deletions(-) diff --git a/gen/src/error.rs b/gen/src/error.rs index 797388edd..163418a1e 100644 --- a/gen/src/error.rs +++ b/gen/src/error.rs @@ -111,12 +111,7 @@ fn sort_syn_errors(error: syn::Error) -> Vec { errors } -fn display_syn_error( - mut stderr: &mut dyn WriteColor, - path: &Path, - source: &str, - error: syn::Error, -) { +fn display_syn_error(stderr: &mut dyn WriteColor, path: &Path, source: &str, error: syn::Error) { let span = error.span(); let start = span.start(); let end = span.end(); @@ -157,7 +152,7 @@ fn display_syn_error( let diagnostic = diagnose(file, start_offset..end_offset, error); let config = Config::default(); - let _ = term::emit_to_write_style(&mut stderr, &config, &files, &diagnostic); + let _ = term::emit_to_write_style(stderr, &config, &files, &diagnostic); } fn diagnose(file: usize, range: Range, error: syn::Error) -> Diagnostic { From a3cc3226efd4064498df18fbe0a3e90978fd53bc Mon Sep 17 00:00:00 2001 From: David Tolnay Date: Thu, 23 Oct 2025 13:11:44 -0700 Subject: [PATCH 3/3] Generalize from WriteColor to WriteStyle --- gen/src/error.rs | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/gen/src/error.rs b/gen/src/error.rs index 163418a1e..50fe4bc3a 100644 --- a/gen/src/error.rs +++ b/gen/src/error.rs @@ -2,8 +2,8 @@ use crate::gen::fs; use crate::syntax; use codespan_reporting::diagnostic::{Diagnostic, Label}; use codespan_reporting::files::SimpleFiles; -use codespan_reporting::term::termcolor::{ColorChoice, StandardStream, WriteColor}; -use codespan_reporting::term::{self, Config}; +use codespan_reporting::term::termcolor::{ColorChoice, StandardStream}; +use codespan_reporting::term::{self, Config, WriteStyle}; use std::borrow::Cow; use std::error::Error as StdError; use std::fmt::{self, Display}; @@ -111,7 +111,7 @@ fn sort_syn_errors(error: syn::Error) -> Vec { errors } -fn display_syn_error(stderr: &mut dyn WriteColor, path: &Path, source: &str, error: syn::Error) { +fn display_syn_error(stderr: &mut dyn WriteStyle, path: &Path, source: &str, error: syn::Error) { let span = error.span(); let start = span.start(); let end = span.end();