about summary refs log tree commit diff
path: root/src/tools/tidy
diff options
context:
space:
mode:
authorbors <bors@rust-lang.org>2022-07-17 13:08:06 +0000
committerbors <bors@rust-lang.org>2022-07-17 13:08:06 +0000
commitc2ecd3af87477147695aa3f6e1237e3185044e62 (patch)
treefb619389d938ca782c61150acfc4edcc0ab8f29f /src/tools/tidy
parent967a9c94b34bb8f394db03b1d205831eddf6f589 (diff)
parent9b49a792efa1a7ccba8447e4e88dc24659b0a02a (diff)
downloadrust-c2ecd3af87477147695aa3f6e1237e3185044e62.tar.gz
rust-c2ecd3af87477147695aa3f6e1237e3185044e62.zip
Auto merge of #99283 - RalfJung:miri, r=RalfJung
update Miri

Fixes https://github.com/rust-lang/rust/issues/99224
r? `@ghost`
Diffstat (limited to 'src/tools/tidy')
-rw-r--r--src/tools/tidy/src/deps.rs1
1 files changed, 1 insertions, 0 deletions
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