Skip to content

Commit 94015d3

Browse files
committed
Auto merge of rust-lang#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
2 parents 15c4cce + 8b09cbb commit 94015d3

File tree

2 files changed

+3
-2
lines changed

2 files changed

+3
-2
lines changed

Diff for: src/tools/tidy/src/deps.rs

+2-1
Original file line numberDiff line numberDiff line change
@@ -132,15 +132,16 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
132132
("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"),
133133
("foldhash", "Zlib"),
134134
("im-rc", "MPL-2.0+"),
135+
("libz-rs-sys", "Zlib"),
135136
("normalize-line-endings", "Apache-2.0"),
136137
("openssl", "Apache-2.0"),
137138
("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0
138-
("sha1_smol", "BSD-3-Clause"),
139139
("similar", "Apache-2.0"),
140140
("sized-chunks", "MPL-2.0+"),
141141
("subtle", "BSD-3-Clause"),
142142
("supports-hyperlinks", "Apache-2.0"),
143143
("unicode-bom", "Apache-2.0"),
144+
("zlib-rs", "Zlib"),
144145
// tidy-alphabetical-end
145146
];
146147

0 commit comments

Comments
 (0)