diff options
| author | bors <bors@rust-lang.org> | 2022-07-17 13:08:06 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-07-17 13:08:06 +0000 |
| commit | c2ecd3af87477147695aa3f6e1237e3185044e62 (patch) | |
| tree | fb619389d938ca782c61150acfc4edcc0ab8f29f /src | |
| parent | 967a9c94b34bb8f394db03b1d205831eddf6f589 (diff) | |
| parent | 9b49a792efa1a7ccba8447e4e88dc24659b0a02a (diff) | |
| download | rust-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')
| m--------- | src/tools/miri | 12 | ||||
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
2 files changed, 7 insertions, 6 deletions
diff --git a/src/tools/miri b/src/tools/miri -Subproject cde87d18239b8d9afa9c6bf1051bf5573dbf326 +Subproject 416cddb2516dea056bf6269eaaa5ba4d24ad083 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 |