diff options
| author | bors <bors@rust-lang.org> | 2020-08-02 16:06:54 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-08-02 16:06:54 +0000 |
| commit | a99ae95c722d4dc8d1eef09aaa4e72d50d496e75 (patch) | |
| tree | fec5a53cc6a046a4dc69d53aca053768380e27e3 /src/tools | |
| parent | e8876ae2c11f341565059b900eeae1254a9accf1 (diff) | |
| parent | 50f2b5d9a02a95d0e3d2183ea58958a5a16a7177 (diff) | |
| download | rust-a99ae95c722d4dc8d1eef09aaa4e72d50d496e75.tar.gz rust-a99ae95c722d4dc8d1eef09aaa4e72d50d496e75.zip | |
Auto merge of #75060 - JohnTitor:rollup-aq8sfxf, r=JohnTitor
Rollup of 10 pull requests Successful merges: - #74686 (BTreeMap: remove into_slices and its unsafe block) - #74762 (BTreeMap::drain_filter should not touch the root during iteration) - #74781 (Clean up E0733 explanation) - #74874 (BTreeMap: define forget_type only when relevant) - #74974 (Make tests faster in Miri) - #75010 (Update elasticlunr-rs and ammonia transitive deps) - #75041 (Replaced log with tracing crate) - #75044 (Clean up E0744 explanation) - #75054 (Rename rustc_middle::cstore::DepKind to CrateDepKind) - #75057 (Avoid dumping rustc invocations to stdout) Failed merges: - #74827 (Move bulk of BTreeMap::insert method down to new method on handle) r? @ghost
Diffstat (limited to 'src/tools')
| -rw-r--r-- | src/tools/tidy/src/deps.rs | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 55e17466a88..1f988f7d81b 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -138,7 +138,6 @@ const PERMITTED_DEPENDENCIES: &[&str] = &[ "rand_chacha", "rand_core", "rand_hc", - "rand_isaac", "rand_pcg", "rand_xorshift", "redox_syscall", |