Skip to content

Commit

Permalink
Auto merge of #45658 - matklad:beta-backport, r=alexcrichton
Browse files Browse the repository at this point in the history 
[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
  • Loading branch information
@bors
bors committed Oct 31, 2017
2 parents e8c426a + db38341 commit 548cc96
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 75 files
+1 −1 src/cargo/core/mod.rs
+122 −92 src/cargo/core/workspace.rs
+44 −18 src/cargo/ops/cargo_rustc/context.rs
+5 −2 src/cargo/ops/cargo_rustc/fingerprint.rs
+3 −3 src/cargo/ops/cargo_rustc/layout.rs
+13 −14 src/cargo/ops/cargo_rustc/mod.rs
+19 −8 src/cargo/ops/lockfile.rs
+7 −9 src/cargo/util/toml/mod.rs
+11 −9 src/doc/book/src/reference/config.md
+1 −2 src/doc/book/src/reference/specifying-dependencies.md
+10 −9 src/doc/config.md
+1 −2 src/doc/specifying-dependencies.md
+336 −303 tests/bad-config.rs
+16 −12 tests/bad-manifest-path.rs
+106 −76 tests/bench.rs
+12 −8 tests/build-auth.rs
+11 −8 tests/build-lib.rs
+4 −4 tests/build-script-env.rs
+198 −142 tests/build-script.rs
+423 −303 tests/build.rs
+24 −16 tests/cargo-features.rs
+8 −7 tests/cargo.rs
+18 −12 tests/cargo_alias_config.rs
+4 −3 tests/cargotest/support/cross_compile.rs
+24 −15 tests/cargotest/support/git.rs
+71 −65 tests/cargotest/support/mod.rs
+4 −4 tests/cargotest/support/publish.rs
+1 −1 tests/cargotest/support/registry.rs
+24 −16 tests/cfg.rs
+56 −47 tests/check.rs
+20 −17 tests/clean.rs
+9 −9 tests/concurrent.rs
+3 −2 tests/config.rs
+76 −59 tests/cross-compile.rs
+6 −6 tests/cross-publish.rs
+2 −2 tests/death.rs
+12 −8 tests/dep-info.rs
+20 −20 tests/directory.rs
+83 −56 tests/doc.rs
+88 −60 tests/features.rs
+3 −2 tests/fetch.rs
+40 −28 tests/freshness.rs
+12 −8 tests/generate-lockfile.rs
+104 −77 tests/git.rs
+47 −46 tests/install.rs
+11 −10 tests/jobserver.rs
+23 −17 tests/local-registry.rs
+59 −12 tests/lockfile-compat.rs
+56 −41 tests/metadata.rs
+6 −4 tests/net-config.rs
+13 −0 tests/new.rs
+107 −82 tests/overrides.rs
+51 −39 tests/package.rs
+54 −38 tests/patch.rs
+63 −56 tests/path.rs
+35 −29 tests/plugins.rs
+24 −19 tests/proc-macro.rs
+26 −25 tests/profiles.rs
+38 −32 tests/publish.rs
+15 −10 tests/read-manifest.rs
+84 −78 tests/registry.rs
+41 −41 tests/required-features.rs
+85 −59 tests/run.rs
+45 −36 tests/rustc.rs
+21 −16 tests/rustdoc.rs
+8 −8 tests/rustdocflags.rs
+95 −95 tests/rustflags.rs
+1 −1 tests/search.rs
+3 −2 tests/small-fd-limits.rs
+221 −153 tests/test.rs
+18 −16 tests/tool-paths.rs
+9 −6 tests/verify-project.rs
+9 −8 tests/version.rs
+6 −5 tests/warn-on-failure.rs
+143 −42 tests/workspaces.rs

0 comments on commit 548cc96

Please sign in to comment.