Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion gen/build/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion gen/cmd/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
2 changes: 1 addition & 1 deletion gen/lib/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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 }
Expand Down
13 changes: 4 additions & 9 deletions gen/src/error.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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};
Expand Down Expand Up @@ -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();
Expand Down Expand Up @@ -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> {
Expand Down
16 changes: 8 additions & 8 deletions third-party/BUCK

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions third-party/Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion third-party/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -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"] }
Expand Down
6 changes: 3 additions & 3 deletions third-party/bazel/BUILD.bazel

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

14 changes: 7 additions & 7 deletions third-party/bazel/defs.bzl

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.