Skip to content

Commit

Permalink
Auto merge of #66674 - flip1995:clippyup, r=Manishearth
Browse files Browse the repository at this point in the history
Update Clippy

r? @Manishearth @oli-obk
  • Loading branch information
bors committed Nov 23, 2019
2 parents 529829a + 450880f commit 0c987c5
Show file tree
Hide file tree
Showing 2 changed files with 38 additions and 4 deletions.
40 changes: 37 additions & 3 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -457,14 +457,15 @@ 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",
"rustc-workspace-hack",
"rustc_tools_util 0.2.0",
"semver",
"serde",
"tester 0.7.0",
]

[[package]]
Expand Down Expand Up @@ -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",
]

Expand Down Expand Up @@ -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",
Expand Down Expand Up @@ -4572,6 +4595,17 @@ dependencies = [
"term 0.6.0",
]

[[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"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/clippy

0 comments on commit 0c987c5

Please sign in to comment.