diff options
| author | bors <bors@rust-lang.org> | 2025-04-17 08:07:28 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2025-04-17 08:07:28 +0000 |
| commit | 94015d3cd4b48d098abd0f3e44af97dab2b713b4 (patch) | |
| tree | 64734c4c5004f0a2c2c2fe7f44dd812488f15ad3 | |
| parent | 15c4ccef03116e6a509199e845ad266306a0e9ee (diff) | |
| parent | 8b09cbba210741a16bedb60d54b7b06b78021ba8 (diff) | |
| download | rust-94015d3cd4b48d098abd0f3e44af97dab2b713b4.tar.gz rust-94015d3cd4b48d098abd0f3e44af97dab2b713b4.zip | |
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
| m--------- | src/tools/cargo | 0 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 3 |
2 files changed, 2 insertions, 1 deletions
diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 864f74d4eadcaea3eeda37a2e7f4d34de233d51 +Subproject d811228b14ae2707323f37346aee3f4147e247e diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 46e55859a57..fd8e4eacc0f 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -132,15 +132,16 @@ const EXCEPTIONS_CARGO: ExceptionList = &[ ("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"), ("foldhash", "Zlib"), ("im-rc", "MPL-2.0+"), + ("libz-rs-sys", "Zlib"), ("normalize-line-endings", "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 - ("sha1_smol", "BSD-3-Clause"), ("similar", "Apache-2.0"), ("sized-chunks", "MPL-2.0+"), ("subtle", "BSD-3-Clause"), ("supports-hyperlinks", "Apache-2.0"), ("unicode-bom", "Apache-2.0"), + ("zlib-rs", "Zlib"), // tidy-alphabetical-end ]; |
