Skip to content

Commit

Permalink
Auto merge of rust-lang#86825 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
Update cargo

5 commits in 4952979031e2cf1d901c817a32e25a156a19db4c..3ebb5f15a940810f250b68821149387af583a79e
2021-07-01 01:14:50 +0000 to 2021-07-02 20:35:38 +0000
- Adjust the edition2021 resolver diff report. (rust-lang/cargo#9649)
- Include the linker in the fingerprint. (rust-lang/cargo#9647)
- Temporarily disable windows env test. (rust-lang/cargo#9646)
- Handle git deleted files with dirty worktree. (rust-lang/cargo#9645)
- Adjust error message with offline and frozen. (rust-lang/cargo#9644)
  • Loading branch information
@bors
bors committed Jul 3, 2021
2 parents 96859db + 7cf9825 commit 71b8742
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 12 files
+5 −0 crates/cargo-test-support/src/lib.rs
+25 −17 src/cargo/core/compiler/fingerprint.rs
+3 −33 src/cargo/core/resolver/features.rs
+13 −18 src/cargo/ops/fix.rs
+2 −5 src/cargo/ops/lockfile.rs
+26 −8 src/cargo/sources/path.rs
+12 −5 tests/testsuite/fix.rs
+23 −5 tests/testsuite/freshness.rs
+2 −1 tests/testsuite/lockfile_compat.rs
+13 −0 tests/testsuite/offline.rs
+34 −0 tests/testsuite/package.rs
+18 −35 tests/testsuite/tool_paths.rs

0 comments on commit 71b8742

Please sign in to comment.