Skip to content

Commit

Permalink
Auto merge of #69627 - ehuss:update-cargo-clippy, r=Dylan-DPC
Browse files Browse the repository at this point in the history
Update cargo, clippy

Closes #69601

## cargo

16 commits in e57bd02999c9f40d52116e0beca7d1dccb0643de..bda50510d1daf6e9c53ad6ccf603da6e0fa8103f
2020-02-21 20:20:10 +0000 to 2020-03-02 18:05:34 +0000
- Fix rare failure in collision_export test. (rust-lang/cargo#7956)
- Ignore broken Cargo.toml in git sources (rust-lang/cargo#7947)
- Add more fingerprint mtime debug logging. (rust-lang/cargo#7952)
- Fix plugin tests for latest nightly. (rust-lang/cargo#7955)
- Simplified usage code of SipHasher (rust-lang/cargo#7945)
- Add a special case for git config discovery inside tests (rust-lang/cargo#7944)
- Fixes issue rust-lang/cargo#7543 (rust-lang/cargo#7946)
- Filter out cfgs which should not be used during build (rust-lang/cargo#7943)
- Provide extra context on a query failure. (rust-lang/cargo#7934)
- Try to clarify `cargo metadata`'s relationship with the workspace. (rust-lang/cargo#7927)
- Update libgit2 dependency (rust-lang/cargo#7939)
- Fix link in comment (rust-lang/cargo#7936)
- Enable `cargo doc --open` tests on macos. (rust-lang/cargo#7932)
- build-std: remove sysroot probe (rust-lang/cargo#7931)
- Try to clarify how feature flags work on the "current" package. (rust-lang/cargo#7928)
- Add extra details in the new feature resolver doc comment. (rust-lang/cargo#7918)

## clippy

6 commits in fc5d0cc..8b7f7e6
2020-02-24 05:58:17 +0000 to 2020-03-02 20:00:31 +0000
- Rustup to #69469 (rust-lang/rust-clippy#5254)
- Some rustups (rust-lang/rust-clippy#5247)
- Update git2 to 0.12 (rust-lang/rust-clippy#5232)
- Rustup to #61812 (rust-lang/rust-clippy#5231)
- Add lint to improve floating-point expressions (rust-lang/rust-clippy#4897)
- Do not run deploy action on other repos (rust-lang/rust-clippy#5222)
  • Loading branch information
bors committed Mar 2, 2020
2 parents 18c275b + 15264e9 commit 97b3d81
Show file tree
Hide file tree
Showing 3 changed files with 8 additions and 8 deletions.
12 changes: 6 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1254,9 +1254,9 @@ dependencies = [

[[package]]
name = "git2"
version = "0.11.0"
version = "0.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "77519ef7c5beee314d0804d4534f01e0f9e8d9acdee2b7a48627e590b27e0ec4"
checksum = "26e07ef27260a78f7e8d218ebac2c72f2c4db50493741b190b6e8eade1da7c68"
dependencies = [
"bitflags",
"libc",
Expand All @@ -1269,9 +1269,9 @@ dependencies = [

[[package]]
name = "git2-curl"
version = "0.12.0"
version = "0.13.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d2559abb1d87d27668d31bd868a000f0e2e0065d10e78961b62da95d7a7f1cc7"
checksum = "af1754ec4170e7dcaf9bb43743bb16eddb8d827b2e0291deb6f220a6e16fe46a"
dependencies = [
"curl",
"git2",
Expand Down Expand Up @@ -1789,9 +1789,9 @@ dependencies = [

[[package]]
name = "libgit2-sys"
version = "0.10.0"
version = "0.11.0+0.99.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d9ec6bca50549d34a392611dde775123086acbd994e3fff64954777ce2dc2e51"
checksum = "4d5d1459353d397a029fb18862166338de938e6be976606bd056cf8f1a912ecf"
dependencies = [
"cc",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 62 files
+3 −3 Cargo.toml
+1 −1 crates/cargo-test-support/Cargo.toml
+1 −1 src/bin/cargo/commands/metadata.rs
+19 −6 src/cargo/core/compiler/build_context/target_info.rs
+1 −1 src/cargo/core/compiler/context/compilation_files.rs
+5 −0 src/cargo/core/compiler/custom_build.rs
+12 −11 src/cargo/core/compiler/fingerprint.rs
+1 −0 src/cargo/core/compiler/mod.rs
+9 −11 src/cargo/core/compiler/standard_lib.rs
+2 −4 src/cargo/core/registry.rs
+11 −2 src/cargo/core/resolver/dep_cache.rs
+28 −6 src/cargo/core/resolver/features.rs
+1 −1 src/cargo/core/resolver/mod.rs
+31 −9 src/cargo/ops/cargo_new.rs
+2 −2 src/cargo/ops/cargo_package.rs
+20 −1 src/cargo/ops/cargo_read_manifest.rs
+16 −1 src/cargo/util/hex.rs
+3 −1 src/cargo/util/paths.rs
+2 −2 src/cargo/util/rustc.rs
+5 −4 src/doc/man/cargo-metadata.adoc
+7 −0 src/doc/man/generated/cargo-bench.html
+7 −0 src/doc/man/generated/cargo-build.html
+7 −0 src/doc/man/generated/cargo-check.html
+7 −0 src/doc/man/generated/cargo-doc.html
+7 −0 src/doc/man/generated/cargo-fix.html
+7 −0 src/doc/man/generated/cargo-install.html
+12 −4 src/doc/man/generated/cargo-metadata.html
+7 −0 src/doc/man/generated/cargo-package.html
+7 −0 src/doc/man/generated/cargo-publish.html
+7 −0 src/doc/man/generated/cargo-run.html
+7 −0 src/doc/man/generated/cargo-rustc.html
+7 −0 src/doc/man/generated/cargo-rustdoc.html
+7 −0 src/doc/man/generated/cargo-test.html
+6 −0 src/doc/man/options-features.adoc
+8 −2 src/etc/man/cargo-bench.1
+6 −0 src/etc/man/cargo-build.1
+6 −0 src/etc/man/cargo-check.1
+8 −2 src/etc/man/cargo-doc.1
+8 −2 src/etc/man/cargo-fix.1
+8 −2 src/etc/man/cargo-install.1
+13 −6 src/etc/man/cargo-metadata.1
+8 −2 src/etc/man/cargo-package.1
+6 −0 src/etc/man/cargo-publish.1
+6 −0 src/etc/man/cargo-run.1
+8 −2 src/etc/man/cargo-rustc.1
+8 −2 src/etc/man/cargo-rustdoc.1
+8 −2 src/etc/man/cargo-test.1
+16 −4 tests/testsuite/bad_config.rs
+20 −0 tests/testsuite/build.rs
+4 −1 tests/testsuite/cargo_features.rs
+5 −1 tests/testsuite/collisions.rs
+4 −1 tests/testsuite/directory.rs
+4 −4 tests/testsuite/doc.rs
+32 −15 tests/testsuite/git.rs
+4 −1 tests/testsuite/git_auth.rs
+4 −1 tests/testsuite/local_registry.rs
+4 −1 tests/testsuite/offline.rs
+67 −1 tests/testsuite/path.rs
+2 −2 tests/testsuite/plugins.rs
+4 −1 tests/testsuite/registry.rs
+12 −3 tests/testsuite/replace.rs
+9 −5 tests/testsuite/workspaces.rs
2 changes: 1 addition & 1 deletion src/tools/clippy
Submodule clippy updated 110 files

0 comments on commit 97b3d81

Please sign in to comment.