diff options
| author | bors <bors@rust-lang.org> | 2020-04-15 19:47:56 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2020-04-15 19:47:56 +0000 |
| commit | d2230290f7220e740ec08f4d844bf5951e1b74b8 (patch) | |
| tree | 06dd0d5fde4dfbfabc647a3f93cd6bb4bc84cad5 | |
| parent | 835428c35d785733e72bfbf32fc2f8fff3e50e63 (diff) | |
| parent | fada4b24b236d90418d5ca5180b94233bc0948c8 (diff) | |
Auto merge of #71139 - matthiaskrgr:submodule_upd, r=Dylan-DPC
submodules: update clippy from af5940b7 to d236b30a Changes: ```` rustup https://github.com/rust-lang/rust/pull/70643 Explain panic on `E0463` in integration tests Temporarily disable rustfmt integration test Cleanup: Use rustc's is_proc_macro_attr Cleanup: Use our `sym!` macro more Fixes #5405: redundant clone false positive with arrays update lints verbose_bit_mask: fix bit mask used in docs Update documentation for new_ret_no_self ```` Fixes #71114
| -rw-r--r-- | Cargo.lock | 26 | ||||
| m--------- | src/tools/clippy | 30 |
2 files changed, 41 insertions, 15 deletions
diff --git a/Cargo.lock b/Cargo.lock index e229448df04..273d63d1e5e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -463,7 +463,7 @@ dependencies = [ "cargo_metadata 0.9.1", "clippy-mini-macro-test", "clippy_lints", - "compiletest_rs", + "compiletest_rs 0.5.0", "derive-new", "lazy_static 1.4.0", "regex", @@ -615,6 +615,28 @@ dependencies = [ ] [[package]] +name = "compiletest_rs" +version = "0.5.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9f737835bfbbe29ed1ff82d5137520338d7ed5bf1a1d4b9c1c7c58bb45b8fa29" +dependencies = [ + "diff", + "filetime", + "getopts", + "libc", + "log", + "miow 0.3.3", + "regex", + "rustfix 0.5.0", + "serde", + "serde_derive", + "serde_json", + "tempfile", + "tester", + "winapi 0.3.8", +] + +[[package]] name = "constant_time_eq" version = "0.1.3" source = "registry+https://github.com/rust-lang/crates.io-index" @@ -2168,7 +2190,7 @@ dependencies = [ "byteorder", "cargo_metadata 0.9.1", "colored", - "compiletest_rs", + "compiletest_rs 0.4.0", "directories", "env_logger 0.7.1", "getrandom", diff --git a/src/tools/clippy b/src/tools/clippy -Subproject af5940b73153b2a4ea2922aa803abac45d02998 +Subproject 6651c1b9b2a1b3e995565467218ff7eca7479c5 |