From 10430dbf8e970b5bfce36cfcd3069e8ccee17f34 Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 15 Jul 2022 10:04:23 -0400 Subject: update Miri --- src/tools/miri | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/tools') diff --git a/src/tools/miri b/src/tools/miri index cde87d18239..416cddb2516 160000 --- a/src/tools/miri +++ b/src/tools/miri @@ -1 +1 @@ -Subproject commit cde87d18239b8d9afa9c6bf1051bf5573dbf326e +Subproject commit 416cddb2516dea056bf6269eaaa5ba4d24ad0832 -- cgit 1.4.1-3-g733a5 From 9b49a792efa1a7ccba8447e4e88dc24659b0a02a Mon Sep 17 00:00:00 2001 From: Ralf Jung Date: Fri, 15 Jul 2022 11:57:04 -0400 Subject: make tidy accept another permutation of this license string --- src/tools/tidy/src/deps.rs | 1 + 1 file changed, 1 insertion(+) (limited to 'src/tools') diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 55cf3fee9bf..ea7eff1a414 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -20,6 +20,7 @@ const LICENSES: &[&str] = &[ "Unlicense OR MIT", "0BSD OR MIT OR Apache-2.0", // adler license "Zlib OR Apache-2.0 OR MIT", // tinyvec + "MIT OR Zlib OR Apache-2.0", // miniz_oxide ]; /// These are exceptions to Rust's permissive licensing policy, and -- cgit 1.4.1-3-g733a5