about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeihang Lo <me@weihanglo.tw>2025-02-14 23:03:56 -0500
committerWeihang Lo <me@weihanglo.tw>2025-02-14 23:11:12 -0500
commited870c3804bd9b8f358a2193cb9b4f1eaf821f3f (patch)
tree35b535be614af086fe331965a7d6f6c9236f093f
parent54a0f387ea8c7bcb79b8e40c074a484d31b51990 (diff)
downloadrust-ed870c3804bd9b8f358a2193cb9b4f1eaf821f3f.tar.gz
rust-ed870c3804bd9b8f358a2193cb9b4f1eaf821f3f.zip
Update cargo
Also add Zlib to Cargo's license exception
m---------src/tools/cargo0
-rw-r--r--src/tools/tidy/src/deps.rs1
2 files changed, 1 insertions, 0 deletions
diff --git a/src/tools/cargo b/src/tools/cargo
-Subproject 2928e32734b04925ee51e1ae88bea9a83d2fd45
+Subproject ce948f4616e3d4277e30c75c8bb01e094910df3
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index d75a68d5973..e8e7dfe0d84 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -132,6 +132,7 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
     ("dunce", "CC0-1.0 OR MIT-0 OR Apache-2.0"),
     ("encoding_rs", "(Apache-2.0 OR MIT) AND BSD-3-Clause"),
     ("fiat-crypto", "MIT OR Apache-2.0 OR BSD-1-Clause"),
+    ("foldhash", "Zlib"),
     ("im-rc", "MPL-2.0+"),
     ("normalize-line-endings", "Apache-2.0"),
     ("openssl", "Apache-2.0"),