Skip to content

Commit 1a56336

Browse files
committed
Auto merge of #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 #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)
2 parents 4268e7e + 78f25e3 commit 1a56336

File tree

2 files changed

+1
-5
lines changed

2 files changed

+1
-5
lines changed

Diff for: Cargo.lock

-4
Original file line numberDiff line numberDiff line change
@@ -304,10 +304,6 @@ dependencies = [
304304
[[package]]
305305
name = "cargo-test-macro"
306306
version = "0.1.0"
307-
dependencies = [
308-
"quote 0.6.12 (registry+https://github.com/rust-lang/crates.io-index)",
309-
"syn 0.15.35 (registry+https://github.com/rust-lang/crates.io-index)",
310-
]
311307

312308
[[package]]
313309
name = "cargo_metadata"

0 commit comments

Comments
 (0)