diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-04-14 09:02:00 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-14 09:02:00 +0200 |
| commit | ab65c68585bae5bfa5a2deee8416231c0c13e708 (patch) | |
| tree | 790f0d657aa6579abe7f86fdd9101390ee62ea16 | |
| parent | 20656d9202a8107c66c00020d96b9de8c0cb7dc0 (diff) | |
| parent | 123b303fd98b3c0214942cbe818e28ae4d234ce4 (diff) | |
| download | rust-ab65c68585bae5bfa5a2deee8416231c0c13e708.tar.gz rust-ab65c68585bae5bfa5a2deee8416231c0c13e708.zip | |
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.
| -rw-r--r-- | Cargo.lock | 18 | ||||
| -rw-r--r-- | src/tools/compiletest/Cargo.toml | 2 |
2 files changed, 16 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index c211024e1ac..1c218bf2cde 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -766,7 +766,7 @@ dependencies = [ "miropt-test-tools", "once_cell", "regex", - "rustfix", + "rustfix 0.8.1", "serde", "serde_json", "tracing", @@ -4856,6 +4856,18 @@ dependencies = [ ] [[package]] +name = "rustfix" +version = "0.8.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "81864b097046da5df3758fdc6e4822bbb70afa06317e8ca45ea1b51cb8c5e5a4" +dependencies = [ + "serde", + "serde_json", + "thiserror", + "tracing", +] + +[[package]] name = "rustfmt-config_proc_macro" version = "0.3.0" dependencies = [ @@ -5896,7 +5908,7 @@ dependencies = [ "prettydiff", "regex", "rustc_version", - "rustfix", + "rustfix 0.6.1", "serde", "serde_json", "tempfile", @@ -5923,7 +5935,7 @@ dependencies = [ "prettydiff", "regex", "rustc_version", - "rustfix", + "rustfix 0.6.1", "serde", "serde_json", "spanned", diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml index 4539c9b3285..38c29b91928 100644 --- a/src/tools/compiletest/Cargo.toml +++ b/src/tools/compiletest/Cargo.toml @@ -20,7 +20,7 @@ tracing-subscriber = { version = "0.3.3", default-features = false, features = [ regex = "1.0" serde = { version = "1.0", features = ["derive"] } serde_json = "1.0" -rustfix = "0.6.0" +rustfix = "0.8.1" once_cell = "1.16.0" walkdir = "2" glob = "0.3.0" |