Skip to content

Commit

Permalink
Rollup merge of #76763 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
Update cargo

6 commits in 875e0123259b0b6299903fe4aea0a12ecde9324f..8777a6b1e8834899f51b7e09cc9b8d85b2417110
2020-09-08 20:17:21 +0000 to 2020-09-15 19:11:03 +0000
- updated yank error message (rust-lang/cargo#8697)
- Fix non-determinism with new feature resolver. (rust-lang/cargo#8701)
- Display formatted output for JSON diffing in tests. (rust-lang/cargo#8692)
- Add --name suggestion for cargo new (rust-lang/cargo#8675)
- Sweep unrelated message from unnecessary workspace infromation (rust-lang/cargo#8681)
- Docs: Make it more clear we have two types of workspaces (rust-lang/cargo#8666)
  • Loading branch information
@Dylan-DPC
Dylan-DPC authored Sep 15, 2020
2 parents 1fd22fc + f95d7ba commit 2e1f012
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 18 files
+4 −2 crates/cargo-test-support/src/publish.rs
+20 −11 src/bin/cargo/commands/install.rs
+5 −1 src/bin/cargo/commands/yank.rs
+11 −0 src/cargo/core/compiler/build_context/target_info.rs
+1 −0 src/cargo/core/compiler/standard_lib.rs
+16 −0 src/cargo/core/compiler/unit.rs
+1 −1 src/cargo/core/compiler/unit_dependencies.rs
+1 −1 src/cargo/core/compiler/unit_graph.rs
+140 −20 src/cargo/ops/cargo_compile.rs
+20 −9 src/cargo/ops/cargo_new.rs
+1 −1 src/cargo/util/config/mod.rs
+1 −1 src/cargo/util/config/target.rs
+8 −1 src/doc/src/reference/workspaces.md
+1 −1 tests/testsuite/alt_registry.rs
+115 −0 tests/testsuite/features2.rs
+3 −2 tests/testsuite/init.rs
+65 −0 tests/testsuite/install.rs
+38 −9 tests/testsuite/new.rs

0 comments on commit 2e1f012

Please sign in to comment.