diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2024-05-10 07:30:20 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-05-10 07:30:20 +0200 |
| commit | 43132819145d3acca7bf57cfda965a3c6737553b (patch) | |
| tree | 40dbbe6166cb8f0d9b0c0b7107cf755939ae567d | |
| parent | 7e4f6082cec194826d8d06743244ac6b12b7a2bf (diff) | |
| parent | 39159a36291d1e9fe87441a054dbed77f3859057 (diff) | |
Rollup merge of #124927 - klensy:xz3, r=Kobzol
opt-dist: use xz2 instead of xz crate xz crate consist of simple reexport of xz2 crate. Why? Idk. Totally not a backdoor.
| -rw-r--r-- | Cargo.lock | 11 | ||||
| -rw-r--r-- | src/tools/opt-dist/Cargo.toml | 2 |
2 files changed, 2 insertions, 11 deletions
diff --git a/Cargo.lock b/Cargo.lock index f1304735f8f..660be8c88af 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2760,7 +2760,7 @@ dependencies = [ "tabled", "tar", "tempfile", - "xz", + "xz2", "zip", ] @@ -6587,15 +6587,6 @@ dependencies = [ ] [[package]] -name = "xz" -version = "0.1.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3c887690ff2a2e233e8e49633461521f98ec57fbff9d59a884c9a4f04ec1da34" -dependencies = [ - "xz2", -] - -[[package]] name = "xz2" version = "0.1.7" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/tools/opt-dist/Cargo.toml b/src/tools/opt-dist/Cargo.toml index 4cb6acb394c..1ff410e723a 100644 --- a/src/tools/opt-dist/Cargo.toml +++ b/src/tools/opt-dist/Cargo.toml @@ -16,7 +16,7 @@ camino = "1" reqwest = { version = "0.11", features = ["blocking"] } zip = { version = "0.6", default-features = false, features = ["deflate"] } tar = "0.4" -xz = "0.1" +xz = { version = "0.1", package = "xz2" } serde = { version = "1", features = ["derive"] } serde_json = "1" glob = "0.3" |
