Skip to content

Commit ab65c68

Browse files
authored
Rollup merge of #123902 - ehuss:update-rustfix2, r=Mark-Simulacrum
compiletest: Update rustfix to 0.8.1 This updates the version of rustfix used in compiletest to be closer to what cargo is using. This is to help ensure `cargo fix` and compiletest are aligned. There are some unpublished changes to `rustfix`, which will update in a future PR when those are published. Will plan to update ui_test in the near future to avoid the duplicate.
2 parents 20656d9 + 123b303 commit ab65c68

File tree

2 files changed

+16
-4
lines changed

2 files changed

+16
-4
lines changed

Cargo.lock

+15-3
Original file line numberDiff line numberDiff line change
@@ -766,7 +766,7 @@ dependencies = [
766766
"miropt-test-tools",
767767
"once_cell",
768768
"regex",
769-
"rustfix",
769+
"rustfix 0.8.1",
770770
"serde",
771771
"serde_json",
772772
"tracing",
@@ -4855,6 +4855,18 @@ dependencies = [
48554855
"serde_json",
48564856
]
48574857

4858+
[[package]]
4859+
name = "rustfix"
4860+
version = "0.8.1"
4861+
source = "registry+https://github.com/rust-lang/crates.io-index"
4862+
checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4"
4863+
dependencies = [
4864+
"serde",
4865+
"serde_json",
4866+
"thiserror",
4867+
"tracing",
4868+
]
4869+
48584870
[[package]]
48594871
name = "rustfmt-config_proc_macro"
48604872
version = "0.3.0"
@@ -5896,7 +5908,7 @@ dependencies = [
58965908
"prettydiff",
58975909
"regex",
58985910
"rustc_version",
5899-
"rustfix",
5911+
"rustfix 0.6.1",
59005912
"serde",
59015913
"serde_json",
59025914
"tempfile",
@@ -5923,7 +5935,7 @@ dependencies = [
59235935
"prettydiff",
59245936
"regex",
59255937
"rustc_version",
5926-
"rustfix",
5938+
"rustfix 0.6.1",
59275939
"serde",
59285940
"serde_json",
59295941
"spanned",

src/tools/compiletest/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ tracing-subscriber = { version = "0.3.3", default-features = false, features = [
2020
regex = "1.0"
2121
serde = { version = "1.0", features = ["derive"] }
2222
serde_json = "1.0"
23-
rustfix = "0.6.0"
23+
rustfix = "0.8.1"
2424
once_cell = "1.16.0"
2525
walkdir = "2"
2626
glob = "0.3.0"

0 commit comments

Comments
 (0)