Auto merge of #139926 - weihanglo:update-cargo, r=weihanglo

Update cargo

4 commits in 864f74d4eadcaea3eeda37a2e7f4d34de233d51e..d811228b14ae2707323f37346aee3f4147e247e6
2025-04-11 20:37:27 +0000 to 2025-04-15 15:18:42 +0000
- use `zlib-rs` for gzip compression in rust code (rust-lang/cargo#15417)
- test(rustfix): Use `snapbox` for snapshot testing (rust-lang/cargo#15429)
- chore(deps): update rust crate gix to 0.71.0 [security] (rust-lang/cargo#15391)
- Make sure search paths inside OUT_DIR precede external paths (rust-lang/cargo#15221)

Also,

* The license exception of sha1_smol with BSD-3-Clause is no longer needed, as `gix-*` doesn't depend on it.
* Cargo depends on zlib-rs, which is distributed under Zlib license

r? ghost
This commit is contained in:
bors 2025-04-17 08:07:28 +00:00
commit 94015d3cd4
2 changed files with 3 additions and 2 deletions

@ -1 +1 @@
Subproject commit 864f74d4eadcaea3eeda37a2e7f4d34de233d51e Subproject commit d811228b14ae2707323f37346aee3f4147e247e6

View file

@ -132,15 +132,16 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"), ("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"),
("foldhash", "Zlib"), ("foldhash", "Zlib"),
("im-rc", "MPL-2.0+"), ("im-rc", "MPL-2.0+"),
("libz-rs-sys", "Zlib"),
("normalize-line-endings", "Apache-2.0"), ("normalize-line-endings", "Apache-2.0"),
("openssl", "Apache-2.0"), ("openssl", "Apache-2.0"),
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0 ("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0
("sha1_smol", "BSD-3-Clause"),
("similar", "Apache-2.0"), ("similar", "Apache-2.0"),
("sized-chunks", "MPL-2.0+"), ("sized-chunks", "MPL-2.0+"),
("subtle", "BSD-3-Clause"), ("subtle", "BSD-3-Clause"),
("supports-hyperlinks", "Apache-2.0"), ("supports-hyperlinks", "Apache-2.0"),
("unicode-bom", "Apache-2.0"), ("unicode-bom", "Apache-2.0"),
("zlib-rs", "Zlib"),
// tidy-alphabetical-end // tidy-alphabetical-end
]; ];