From a1e292a63a7ae8138114f1166f1aeb92061ea2bb Mon Sep 17 00:00:00 2001 From: Weihang Lo Date: Fri, 25 Jul 2025 14:44:13 -0400 Subject: [PATCH] Update cargo ring is brought into Cargo transitively because Cargo now provides optional (unstable) reqwest HTTP backend. --- src/tools/cargo | 2 +- src/tools/tidy/src/deps.rs | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/tools/cargo b/src/tools/cargo index 6833aa715d724..9b296973b425f 160000 --- a/src/tools/cargo +++ b/src/tools/cargo @@ -1 +1 @@ -Subproject commit 6833aa715d724437dc1247d0166afe314ab6854e +Subproject commit 9b296973b425ffb159e12cf3cd56580fd5c85382 diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index d17ae162ab235..21cbb143c5111 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+"),