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

bors · bors · commit 71b8742bbcbe · 2021-07-03T20:21:39.000Z
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)
diff --git a/src/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 4952979031e2cf1d901c817a32e25a156a19db4c
+Subproject commit 3ebb5f15a940810f250b68821149387af583a79e
