Merge pull request #1663 from dtolnay/writestyle

Update codespan-reporting to pull in ?Sized fix

Author: dtolnay

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 }

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 }

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 }

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,12 +111,7 @@ fn sort_syn_errors(error: syn::Error) -> Vec<syn::Error> {
     errors
 }
 
-fn display_syn_error(
-    mut 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();
@@ -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<usize>, error: syn::Error) -> Diagnostic<usize> {

third-party/BUCK

@@ -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"] }