nordic-dev.net/rust
nordic-dev.net/rust
2
0
Fork 0
mirror of https://github.com/rust-lang/rust.git synced 2024-11-22 06:44:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

dedupe 'annotate-snippets' crate versions

Browse Source
This commit is contained in:
klensy 2022-07-31 16:44:06 +03:00
parent 06f4950cbd
commit 754b52669f
4 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Cargo.lock
View File

@ -82,12 +82,6 @@ dependencies = [
"url 2.2.2", "url 2.2.2",
] ]
[[package]]
name = "annotate-snippets"
version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d78ea013094e5ea606b1c05fe35f1dd7ea1eb1ea259908d040b25bd5ec677ee5"
[[package]] [[package]]
name = "annotate-snippets" name = "annotate-snippets"
version = "0.9.1" version = "0.9.1"
@ -3861,7 +3855,7 @@ dependencies = [
name = "rustc_errors" name = "rustc_errors"
version = "0.0.0" version = "0.0.0"
dependencies = [ dependencies = [
"annotate-snippets 0.8.0", "annotate-snippets",
"atty", "atty",
"rustc_data_structures", "rustc_data_structures",
"rustc_error_messages", "rustc_error_messages",
@ -4113,7 +4107,7 @@ dependencies = [
name = "rustc_macros" name = "rustc_macros"
version = "0.1.0" version = "0.1.0"
dependencies = [ dependencies = [
"annotate-snippets 0.8.0", "annotate-snippets",
"fluent-bundle", "fluent-bundle",
"fluent-syntax", "fluent-syntax",
"proc-macro2", "proc-macro2",
@ -4713,7 +4707,7 @@ dependencies = [
name = "rustfmt-nightly" name = "rustfmt-nightly"
version = "1.5.1" version = "1.5.1"
dependencies = [ dependencies = [
"annotate-snippets 0.9.1", "annotate-snippets",
"anyhow", "anyhow",
"bytecount", "bytecount",
"cargo_metadata 0.14.0", "cargo_metadata 0.14.0",

2
compiler/rustc_errors/Cargo.toml
View File

@ -18,7 +18,7 @@ rustc_lint_defs = { path = "../rustc_lint_defs" }
unicode-width = "0.1.4" unicode-width = "0.1.4"
atty = "0.2" atty = "0.2"
termcolor = "1.0" termcolor = "1.0"
annotate-snippets = "0.8.0" annotate-snippets = "0.9"
termize = "0.1.1" termize = "0.1.1"
serde = { version = "1.0.125", features = ["derive"] } serde = { version = "1.0.125", features = ["derive"] }
serde_json = "1.0.59" serde_json = "1.0.59"

6
compiler/rustc_errors/src/annotate_snippet_emitter_writer.rs
View File

@ -183,7 +183,11 @@ impl AnnotateSnippetEmitterWriter {
annotation_type: annotation_type_for_level(*level), annotation_type: annotation_type_for_level(*level),
}), }),
footer: vec![], footer: vec![],
opt: FormatOptions { color: true, anonymized_line_numbers: self.ui_testing }, opt: FormatOptions {
color: true,
anonymized_line_numbers: self.ui_testing,
margin: None,
},
slices: annotated_files slices: annotated_files
.iter() .iter()
.map(|(source, line_index, annotations)| { .map(|(source, line_index, annotations)| {

2
compiler/rustc_macros/Cargo.toml
View File

@ -7,7 +7,7 @@ edition = "2021"
proc-macro = true proc-macro = true
[dependencies] [dependencies]
annotate-snippets = "0.8.0" annotate-snippets = "0.9"
fluent-bundle = "0.15.2" fluent-bundle = "0.15.2"
fluent-syntax = "0.11" fluent-syntax = "0.11"
synstructure = "0.12.1" synstructure = "0.12.1"