about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeihang Lo <me@weihanglo.tw>2025-04-15 16:27:14 -0400
committerWeihang Lo <me@weihanglo.tw>2025-04-16 18:37:38 -0400
commit8b09cbba210741a16bedb60d54b7b06b78021ba8 (patch)
treee9569c807c44dd5408ea31a301e0f78909f542e4
parent40dacd50b7074783db748d73925ac5c3693a7ec1 (diff)
downloadrust-8b09cbba210741a16bedb60d54b7b06b78021ba8.tar.gz
rust-8b09cbba210741a16bedb60d54b7b06b78021ba8.zip
Update cargo
* 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
m---------src/tools/cargo0
-rw-r--r--src/tools/tidy/src/deps.rs3
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 88c2a02798a..8eca2eb4503 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
 ];