diff options
| author | bors <bors@rust-lang.org> | 2019-11-23 18:51:10 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2019-11-23 18:51:10 +0000 |
| commit | 0c987c5c02498b4e77f5dfae1f6914ffb9268575 (patch) | |
| tree | 8d1010f258058d60dfe9670a15cf1b8dce3006aa | |
| parent | 529829a037b49e053d7f70e8917296eef0d6c2ec (diff) | |
| parent | 450880fd896dd91de76dc07e506abd11b2c50307 (diff) | |
| download | rust-0c987c5c02498b4e77f5dfae1f6914ffb9268575.tar.gz rust-0c987c5c02498b4e77f5dfae1f6914ffb9268575.zip | |
Auto merge of #66674 - flip1995:clippyup, r=Manishearth
Update Clippy r? @Manishearth @oli-obk
| -rw-r--r-- | Cargo.lock | 40 | ||||
| m--------- | src/tools/clippy | 23 |
2 files changed, 53 insertions, 10 deletions
diff --git a/Cargo.lock b/Cargo.lock index 93cfc544859..012328b702d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -457,7 +457,7 @@ dependencies = [ "cargo_metadata 0.9.0", "clippy-mini-macro-test", "clippy_lints", - "compiletest_rs", + "compiletest_rs 0.4.0", "derive-new", "lazy_static 1.3.0", "regex", @@ -465,6 +465,7 @@ dependencies = [ "rustc_tools_util 0.2.0", "semver", "serde", + "tester 0.7.0", ] [[package]] @@ -603,7 +604,29 @@ dependencies = [ "serde_derive", "serde_json", "tempfile", - "tester", + "tester 0.6.0", + "winapi 0.3.8", +] + +[[package]] +name = "compiletest_rs" +version = "0.4.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d7b678957210a00ba0fbeacc23d38cbfbf29895564da1616564634351e1dac5e" +dependencies = [ + "diff", + "filetime", + "getopts", + "libc", + "log", + "miow 0.3.3", + "regex", + "rustfix", + "serde", + "serde_derive", + "serde_json", + "tempfile", + "tester 0.7.0", "winapi 0.3.8", ] @@ -2172,7 +2195,7 @@ dependencies = [ "byteorder", "cargo_metadata 0.9.0", "colored", - "compiletest_rs", + "compiletest_rs 0.3.26", "directories", "env_logger 0.7.1", "getrandom", @@ -4573,6 +4596,17 @@ dependencies = [ ] [[package]] +name = "tester" +version = "0.7.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ee72ec31009a42b53de9a6b7d8f462b493ab3b1e4767bda1fcdbb52127f13b6c" +dependencies = [ + "getopts", + "libc", + "term 0.6.0", +] + +[[package]] name = "textwrap" version = "0.11.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/tools/clippy b/src/tools/clippy -Subproject b4f1769734b6204fc6bece8556b7b80a7683271 +Subproject 60e8413a4e5b7c67001176783893b12411ce355 |