about summary refs log tree commit diff
diff options
context:
space:
mode:
authorWeihang Lo <me@weihanglo.tw>2025-07-25 14:44:13 -0400
committerWeihang Lo <me@weihanglo.tw>2025-07-25 17:19:39 -0400
commita1e292a63a7ae8138114f1166f1aeb92061ea2bb (patch)
treea7c8361dd36e81e31292bf2a8a9895a83e24514e
parentb56aaec52bc0fa35591a872fb4aac81f606e265c (diff)
downloadrust-a1e292a63a7ae8138114f1166f1aeb92061ea2bb.tar.gz
rust-a1e292a63a7ae8138114f1166f1aeb92061ea2bb.zip
Update cargo
ring is brought into Cargo transitively because Cargo now
provides optional (unstable) reqwest HTTP backend.
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 6833aa715d724437dc1247d0166afe314ab6854
+Subproject 9b296973b425ffb159e12cf3cd56580fd5c8538
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index d17ae162ab2..21cbb143c51 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -135,6 +135,7 @@ const EXCEPTIONS_CARGO: ExceptionList = &[
     ("libz-rs-sys", "Zlib"),
     ("normalize-line-endings", "Apache-2.0"),
     ("openssl", "Apache-2.0"),
+    ("ring", "Apache-2.0 AND ISC"),
     ("ryu", "Apache-2.0 OR BSL-1.0"), // BSL is not acceptble, but we use it under Apache-2.0
     ("similar", "Apache-2.0"),
     ("sized-chunks", "MPL-2.0+"),