Skip to content

Commit

Permalink
Auto merge of rust-lang#63587 - flip1995:clippyup, r=flip1995
Browse files Browse the repository at this point in the history 
Update Clippy and cargo

r? @Manishearth  @oli-obk
  • Loading branch information
@bors
bors committed Aug 20, 2019
2 parents 1489095 + 96c3ec1 commit 51879c3
Show file tree
Hide file tree
Showing 3 changed files with 44 additions and 25 deletions.
65 changes: 42 additions & 23 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,7 +265,7 @@ dependencies = [

[[package]]
name = "cargo"
version = "0.39.0"
version = "0.40.0"
dependencies = [
"atty",
"bytesize",
Expand All @@ -287,7 +287,7 @@ dependencies = [
"git2-curl",
"glob",
"hex",
"home",
"home 0.4.2",
"ignore",
"im-rc",
"jobserver",
Expand All @@ -309,16 +309,16 @@ dependencies = [
"same-file",
"semver",
"serde",
"serde_ignored",
"serde_ignored 0.1.0",
"serde_json",
"shell-escape",
"strip-ansi-escapes",
"tar",
"tempfile",
"termcolor",
"toml 0.5.1",
"toml 0.5.3",
"unicode-width",
"url 2.0.0",
"url 2.1.0",
"walkdir",
"winapi 0.3.6",
]
Expand Down Expand Up @@ -442,9 +442,9 @@ dependencies = [
"semver",
"serde",
"smallvec",
"toml 0.5.1",
"toml 0.5.3",
"unicode-normalization",
"url 1.7.2",
"url 2.1.0",
]

[[package]]
Expand Down Expand Up @@ -574,7 +574,7 @@ checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"

[[package]]
name = "crates-io"
version = "0.27.0"
version = "0.28.0"
dependencies = [
"curl",
"failure",
Expand All @@ -583,7 +583,7 @@ dependencies = [
"serde",
"serde_derive",
"serde_json",
"url 2.0.0",
"url 2.1.0",
]

[[package]]
Expand Down Expand Up @@ -1167,7 +1167,7 @@ dependencies = [
"log",
"openssl-probe",
"openssl-sys",
"url 2.0.0",
"url 2.1.0",
]

[[package]]
Expand All @@ -1179,7 +1179,7 @@ dependencies = [
"curl",
"git2",
"log",
"url 2.0.0",
"url 2.1.0",
]

[[package]]
Expand Down Expand Up @@ -1277,6 +1277,16 @@ dependencies = [
"winapi 0.3.6",
]

[[package]]
name = "home"
version = "0.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "013e4e6e9134211bb4d6bf53dd8cfb75d9e2715cc33614b9c0827718c6fbe0b8"
dependencies = [
"scopeguard 1.0.0",
"winapi 0.3.6",
]

[[package]]
name = "html5ever"
version = "0.23.0"
Expand Down Expand Up @@ -1775,7 +1785,7 @@ dependencies = [
"serde_json",
"shlex",
"tempfile",
"toml 0.5.1",
"toml 0.5.3",
"toml-query",
]

Expand Down Expand Up @@ -2720,7 +2730,7 @@ dependencies = [
"failure",
"futures",
"heck",
"home",
"home 0.3.3",
"itertools 0.8.0",
"jsonrpc-core",
"lazy_static 1.3.0",
Expand All @@ -2744,13 +2754,13 @@ dependencies = [
"rustfmt-nightly",
"serde",
"serde_derive",
"serde_ignored",
"serde_ignored 0.0.4",
"serde_json",
"tempfile",
"tokio",
"tokio-process",
"tokio-timer",
"toml 0.5.1",
"toml 0.5.3",
"url 1.7.2",
"walkdir",
]
Expand Down Expand Up @@ -3572,7 +3582,7 @@ dependencies = [
"serde_json",
"structopt",
"term 0.6.0",
"toml 0.5.1",
"toml 0.5.3",
"unicode-segmentation",
"unicode-width",
"unicode_categories",
Expand Down Expand Up @@ -3666,9 +3676,9 @@ checksum = "388a1df253eca08550bef6c72392cfe7c30914bf41df5269b68cbd6ff8f570a3"

[[package]]
name = "serde"
version = "1.0.92"
version = "1.0.99"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "32746bf0f26eab52f06af0d0aa1984f641341d06d8d673c693871da2d188c9be"
checksum = "fec2851eb56d010dc9a21b89ca53ee75e6528bab60c11e89d38390904982da9f"
dependencies = [
"serde_derive",
]
Expand All @@ -3693,6 +3703,15 @@ dependencies = [
"serde",
]

[[package]]
name = "serde_ignored"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3c24bbb8f4b81834f618cd3e28698235c2fba06ddf7f4fbe30519dd081364e59"
dependencies = [
"serde",
]

[[package]]
name = "serde_json"
version = "1.0.40"
Expand Down Expand Up @@ -4366,9 +4385,9 @@ dependencies = [

[[package]]
name = "toml"
version = "0.5.1"
version = "0.5.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b8c96d7873fa7ef8bdeb3a9cda3ac48389b4154f32b9803b4bc26220b677b039"
checksum = "c7aabe75941d914b72bf3e5d3932ed92ce0664d49d8432305a8b547c37227724"
dependencies = [
"serde",
]
Expand All @@ -4384,7 +4403,7 @@ dependencies = [
"is-match",
"lazy_static 1.3.0",
"regex",
"toml 0.5.1",
"toml 0.5.3",
"toml-query_derive",
]

Expand Down Expand Up @@ -4512,9 +4531,9 @@ dependencies = [

[[package]]
name = "url"
version = "2.0.0"
version = "2.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77ddaf52e65c6b81c56b7e957c0b1970f7937f21c5c6774c4e56fcb4e20b48c6"
checksum = "75b414f6c464c879d7f9babf951f23bc3743fb7313c081b2e6ca719067ea9d61"
dependencies = [
"idna 0.2.0",
"matches",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 62 files
+110 −2 CHANGELOG.md
+5 −5 Cargo.toml
+1 −1 crates/crates-io/Cargo.toml
+9 −1 src/cargo/core/compiler/build_context/target_info.rs
+14 −3 src/cargo/core/compiler/context/mod.rs
+25 −16 src/cargo/core/compiler/custom_build.rs
+2 −4 src/cargo/core/resolver/dep_cache.rs
+4 −4 src/cargo/core/resolver/encode.rs
+2 −0 src/cargo/core/shell.rs
+11 −0 src/cargo/core/source/source_id.rs
+7 −3 src/cargo/core/workspace.rs
+3 −0 src/cargo/lib.rs
+15 −12 src/cargo/ops/cargo_compile.rs
+1 −0 src/cargo/ops/cargo_fetch.rs
+64 −2 src/cargo/ops/cargo_install.rs
+35 −1 src/cargo/ops/cargo_package.rs
+8 −0 src/cargo/ops/common_for_install_and_uninstall.rs
+43 −30 src/cargo/ops/registry.rs
+7 −1 src/cargo/ops/vendor.rs
+22 −21 src/cargo/sources/git/utils.rs
+1 −1 src/cargo/sources/registry/remote.rs
+6 −1 src/cargo/util/rustc.rs
+14 −10 src/cargo/util/toml/mod.rs
+10 −5 src/doc/man/generated/cargo-bench.html
+10 −5 src/doc/man/generated/cargo-build.html
+10 −5 src/doc/man/generated/cargo-check.html
+10 −5 src/doc/man/generated/cargo-doc.html
+10 −5 src/doc/man/generated/cargo-fix.html
+10 −5 src/doc/man/generated/cargo-test.html
+9 −5 src/doc/man/options-packages.adoc
+12 −8 src/etc/man/cargo-bench.1
+12 −8 src/etc/man/cargo-build.1
+12 −8 src/etc/man/cargo-check.1
+12 −8 src/etc/man/cargo-doc.1
+12 −8 src/etc/man/cargo-fix.1
+12 −8 src/etc/man/cargo-test.1
+2 −2 tests/testsuite/bad_config.rs
+3 −3 tests/testsuite/build.rs
+59 −0 tests/testsuite/build_script.rs
+135 −0 tests/testsuite/cfg.rs
+0 −3 tests/testsuite/check-style.sh
+1 −2 tests/testsuite/clean.rs
+2 −2 tests/testsuite/collisions.rs
+4 −8 tests/testsuite/concurrent.rs
+2 −2 tests/testsuite/config.rs
+2 −4 tests/testsuite/corrupt_git.rs
+1 −2 tests/testsuite/directory.rs
+1 −2 tests/testsuite/doc.rs
+19 −0 tests/testsuite/fetch.rs
+8 −41 tests/testsuite/fix.rs
+169 −107 tests/testsuite/git.rs
+1 −2 tests/testsuite/install.rs
+66 −5 tests/testsuite/install_upgrade.rs
+1 −2 tests/testsuite/lockfile_compat.rs
+1 −2 tests/testsuite/offline.rs
+4 −8 tests/testsuite/package.rs
+164 −8 tests/testsuite/publish.rs
+27 −14 tests/testsuite/support/git.rs
+2 −2 tests/testsuite/support/mod.rs
+37 −3 tests/testsuite/support/publish.rs
+41 −10 tests/testsuite/vendor.rs
+66 −5 tests/testsuite/workspaces.rs
2 changes: 1 addition & 1 deletion src/tools/clippy
Submodule clippy updated from 72da10 to cd3df6

0 comments on commit 51879c3

Please sign in to comment.