Merge pull request #1661 from dtolnay/codespan

Update codespan-reporting to 0.13

Author: dtolnay

.github/workflows/ci.yml

@@ -21,7 +21,7 @@ jobs:
     strategy:
       fail-fast: false
       matrix:
-        rust: [nightly, beta, stable, 1.82.0]
+        rust: [nightly, beta, stable, 1.87.0]
         os: [ubuntu]
         cc: [g++]
         flags: ['']

Cargo.toml

@@ -12,7 +12,7 @@ keywords = ["ffi", "c++"]
 license = "MIT OR Apache-2.0"
 links = "cxxbridge1"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.82"
+rust-version = "1.87"
 
 [features]
 default = ["std", "cxxbridge-flags/default"] # c++11

README.md

@@ -24,7 +24,7 @@ cxx = "1.0"
 cxx-build = "1.0"
 ```
 
-*Compiler support: requires rustc 1.82+ and c++11 or newer*<br>
+*Compiler support: requires rustc 1.87+ and c++11 or newer*<br>
 *[Release notes](https://github.com/dtolnay/cxx/releases)*
 
 <br>

build.rs

@@ -32,8 +32,8 @@ fn main() {
     println!("cargo:rustc-check-cfg=cfg(skip_ui_tests)");
 
     if let Some(rustc) = rustc_version() {
-        if rustc.minor < 82 {
-            println!("cargo:warning=The cxx crate requires a rustc version 1.82.0 or newer.");
+        if rustc.minor < 87 {
+            println!("cargo:warning=The cxx crate requires a rustc version 1.87.0 or newer.");
             println!(
                 "cargo:warning=You appear to be building with: {}",
                 rustc.version,

flags/Cargo.toml

@@ -7,7 +7,7 @@ description = "Compiler configuration of the `cxx` crate (implementation detail)
 edition = "2021"
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.82"
+rust-version = "1.87"
 
 [features]
 default = [] # c++11

gen/build/Cargo.toml

@@ -11,14 +11,14 @@ homepage = "https://cxx.rs"
 keywords = ["ffi", "build-dependencies"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.82"
+rust-version = "1.87"
 
 [features]
 parallel = ["cc/parallel"]
 
 [dependencies]
 cc = "1.0.101"
-codespan-reporting = "0.12"
+codespan-reporting = "0.13"
 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

@@ -10,15 +10,15 @@ homepage = "https://cxx.rs"
 keywords = ["ffi"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.82"
+rust-version = "1.87"
 
 [[bin]]
 name = "cxxbridge"
 path = "src/main.rs"
 
 [dependencies]
 clap = { version = "4.3.11", default-features = false, features = ["error-context", "help", "std", "suggestions", "usage"] }
-codespan-reporting = "0.12"
+codespan-reporting = "0.13"
 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

@@ -10,10 +10,10 @@ exclude = ["build.rs"]
 keywords = ["ffi"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.82"
+rust-version = "1.87"
 
 [dependencies]
-codespan-reporting = "0.12"
+codespan-reporting = "0.13"
 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

@@ -111,7 +111,12 @@ fn sort_syn_errors(error: syn::Error) -> Vec<syn::Error> {
     errors
 }
 
-fn display_syn_error(stderr: &mut dyn WriteColor, path: &Path, source: &str, error: syn::Error) {
+fn display_syn_error(
+    mut stderr: &mut dyn WriteColor,
+    path: &Path,
+    source: &str,
+    error: syn::Error,
+) {
     let span = error.span();
     let start = span.start();
     let end = span.end();
@@ -152,7 +157,7 @@ fn display_syn_error(stderr: &mut dyn WriteColor, path: &Path, source: &str, err
     let diagnostic = diagnose(file, start_offset..end_offset, error);
 
     let config = Config::default();
-    let _ = term::emit(stderr, &config, &files, &diagnostic);
+    let _ = term::emit_to_write_style(&mut stderr, &config, &files, &diagnostic);
 }
 
 fn diagnose(file: usize, range: Range<usize>, error: syn::Error) -> Diagnostic<usize> {

macro/Cargo.toml

@@ -10,7 +10,7 @@ homepage = "https://cxx.rs"
 keywords = ["ffi"]
 license = "MIT OR Apache-2.0"
 repository = "https://github.com/dtolnay/cxx"
-rust-version = "1.82"
+rust-version = "1.87"
 
 [lib]
 proc-macro = true