From 8f5ea8083de214205024526efb1830504a4a5431 Mon Sep 17 00:00:00 2001 From: Jubilee Young Date: Mon, 17 Aug 2020 16:07:09 -0700 Subject: [PATCH] Resolve licensing by updating tinyvec 0.3.3 -> 0.3.4 Per https://github.com/rust-lang/rust/pull/75555#issuecomment-675090858 Zlib license might be OK. "OR Apache-2.0 OR MIT" definitely is. unicode-normalization depends on this and rustc_parse, clippy, and many other things depend on unicode-normalization. --- Cargo.lock | 4 ++-- src/tools/tidy/src/deps.rs | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/Cargo.lock b/Cargo.lock index 3cb73a34049..977733ffac5 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -4701,9 +4701,9 @@ dependencies = [ [[package]] name = "tinyvec" -version = "0.3.3" +version = "0.3.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "53953d2d3a5ad81d9f844a32f14ebb121f50b650cd59d0ee2a07cf13c617efed" +checksum = "238ce071d267c5710f9d31451efec16c5ee22de34df17cc05e56cbc92e967117" [[package]] name = "tokio" diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 9ed3c6e0d98..4f98944e4c8 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -18,6 +18,7 @@ const LICENSES: &[&str] = &[ "Unlicense/MIT", "Unlicense OR MIT", "0BSD OR MIT OR Apache-2.0", // adler license + "Zlib OR Apache-2.0 OR MIT", // tinyvec ]; /// These are exceptions to Rust's permissive licensing policy, and