Auto merge of rust-lang#62914 - ehuss:update-cargo, r=alexcrichton

Update cargo 11 commits in e3563dbdcd2e370bc4f11d080f739d82d25773fd..d0f828419d6ce6be21a90866964f58eb2c07cd56 2019-07-16 19:22:44 +0000 to 2019-07-23 21:58:59 +0000 - Remove include/exclude glob warning. (rust-lang/cargo#7170) - Optimize lock file format for git merge conflicts (rust-lang/cargo#7070) - Set up CI with Azure Pipelines (rust-lang/cargo#7139) - Force clippy to run. (rust-lang/cargo#7157) - Work around rust-lang#61440 (rust-lang/cargo#7158) - initial working version of cargo fix --clippy (rust-lang/cargo#7069) - Optimize runtime of `#[cargo_test_macro]` (rust-lang/cargo#7146) - Don't fail if we can't acquire readonly lock (rust-lang/cargo#7149) - Add support for multiple --features options (rust-lang/cargo#7084) - Fix a typo in an env var name (rust-lang/cargo#7145) - Add a way to disable all nightly tests (rust-lang/cargo#7142)
alexcrichton · Jul 26, 2019 · 1a56336 · 1a56336
2 parents 4268e7e + 78f25e3
commit 1a56336
Show file tree

Hide file tree

Showing 2 changed files with 1 addition and 5 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -304,10 +304,6 @@ dependencies = [
 [[package]]
 name = "cargo-test-macro"
 version = "0.1.0"
-dependencies = [
- "quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
- "syn 0.15.35 (registry+https://github.com/rust-lang/crates.io-index)",
-]
 
 [[package]]
 name = "cargo_metadata"

diff --git a/src/tools/cargo b/src/tools/cargo
+0 −75		.travis.yml
+1 −2		README.md
+0 −22		appveyor.yml
+91 −0		azure-pipelines.yml
+28 −0		ci/azure-install-rust.yml
+28 −0		ci/azure-test-all.yml
+0 −4		crates/cargo-test-macro/Cargo.toml
+51 −18		crates/cargo-test-macro/src/lib.rs
+3 −2		src/bin/cargo/commands/clippy.rs
+26 −0		src/bin/cargo/commands/fix.rs
+3 −3		src/cargo/core/compiler/build_config.rs
+1 −4		src/cargo/core/compiler/build_context/mod.rs
+28 −6		src/cargo/core/compiler/compilation.rs
+5 −4		src/cargo/core/compiler/mod.rs
+272 −59		src/cargo/core/resolver/encode.rs
+4 −2		src/cargo/core/resolver/mod.rs
+61 −0		src/cargo/core/resolver/resolve.rs
+50 −20		src/cargo/ops/fix.rs
+10 −5		src/cargo/ops/lockfile.rs
+1 −116		src/cargo/sources/path.rs
+3 −1		src/cargo/util/command_prelude.rs
+26 −19		src/cargo/util/config.rs
+8 −3		src/cargo/util/rustc.rs
+20 −20		tests/testsuite/cache_messages.rs
+40 −0		tests/testsuite/clippy.rs
+7 −1		tests/testsuite/config.rs
+57 −0		tests/testsuite/features.rs
+49 −2		tests/testsuite/fix.rs
+8 −8		tests/testsuite/freshness.rs
+125 −0		tests/testsuite/lockfile_compat.rs
+1 −0		tests/testsuite/main.rs
+5 −38		tests/testsuite/package.rs
+71 −35		tests/testsuite/support/mod.rs
+7 −3		tests/testsuite/tool_paths.rs