Skip to content

Commit

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

7 commits in b1dd22e668af5279e13a071ad4b17435bd6bfa4c..8827baaa781b37872134c1ba692a6f0aeb37890e
2022-07-09 14:48:50 +0000 to 2022-07-14 02:56:51 +0000
- Add a test for regressions in selecting the correct workspace root (rust-lang/cargo#10862)
- clarify profile used for 'cargo install --debug' (rust-lang/cargo#10861)
- servers should use 404 (rust-lang/cargo#10860)
- test(add): Ensure comments are preserved (rust-lang/cargo#10849)
- Fix nested workspace resolution (rust-lang/cargo#10846)
- Small tweaks to the future-incompat docs. (rust-lang/cargo#10856)
- Fixed extra period typo (rust-lang/cargo#10847)
  • Loading branch information
@bors
bors committed Jul 14, 2022
2 parents 8a392a5 + 8d06175 commit 431c6f8
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 15 files
+4 −1 src/bin/cargo/commands/install.rs
+11 −4 src/cargo/core/workspace.rs
+1 −1 src/cargo/ops/resolve.rs
+19 −6 src/doc/src/reference/future-incompat-report.md
+1 −1 src/doc/src/reference/profiles.md
+8 −7 src/doc/src/reference/registries.md
+1 −1 src/etc/_cargo
+1 −0 tests/testsuite/cargo_add/mod.rs
+8 −0 tests/testsuite/cargo_add/overwrite_preserves_inline_table/in/Cargo.toml
+0 −0 tests/testsuite/cargo_add/overwrite_preserves_inline_table/in/src/lib.rs
+25 −0 tests/testsuite/cargo_add/overwrite_preserves_inline_table/mod.rs
+8 −0 tests/testsuite/cargo_add/overwrite_preserves_inline_table/out/Cargo.toml
+7 −0 tests/testsuite/cargo_add/overwrite_preserves_inline_table/stderr.log
+0 −0 tests/testsuite/cargo_add/overwrite_preserves_inline_table/stdout.log
+47 −0 tests/testsuite/workspaces.rs

0 comments on commit 431c6f8

Please sign in to comment.