Auto merge of #45658 - matklad:beta-backport, r=alexcrichton

bors · bors · commit 548cc968c97a · 2017-10-31T20:31:03.000Z
[beta] Cargo does not remove [root] from lockfile with --frozen Okey, this is supposed to be a backport of rust-lang/cargo#4687, but looks like beta cargo at rust-lang and beta cargo at cargo are different at the moment, hence the huge diff (one commit in the diffrence rewrote every single test file in Cargo) rust-lang: https://github.com/rust-lang/cargo/commits/463e850146e9454b8b953ff73772a35b286b58e7 cargo: https://github.com/rust-lang/cargo/commits/rust-1.22.0 r? @alexcrichton
diff --git a/src/tools/cargo b/src/tools/cargo
@@ -1 +1 @@
-Subproject commit 463e850146e9454b8b953ff73772a35b286b58e7
+Subproject commit 3bab08445141279cc63f68f50be27623637e4c93
