diff options
| author | bors <bors@rust-lang.org> | 2022-05-04 07:31:58 +0000 |
|---|---|---|
| committer | bors <bors@rust-lang.org> | 2022-05-04 07:31:58 +0000 |
| commit | fed2c43bbf4e3955f83cea77c0b1709c0dbcebf3 (patch) | |
| tree | 9d502f5f46b7b6ba9e3b26dc0797eb9331da7471 | |
| parent | 21d613b1116eef86d613d5f7f10d8fa5f22e27b3 (diff) | |
| parent | 22326c56cc189e4738406001152019737f947ab8 (diff) | |
| download | rust-fed2c43bbf4e3955f83cea77c0b1709c0dbcebf3.tar.gz rust-fed2c43bbf4e3955f83cea77c0b1709c0dbcebf3.zip | |
Auto merge of #96693 - ehuss:update-cargo, r=ehuss
Update cargo 7 commits in f63f23ff1f1a12ede8585bbd1bbf0c536e50293d..a44758ac805600edbb6ba51e7e6fb81a6077c0cd 2022-04-28 03:15:50 +0000 to 2022-05-04 02:29:34 +0000 - Add support for `-Zbuild-std` to `cargo fetch` (rust-lang/cargo#10129) - Migrate tests of `cargo-init` to snapbox (rust-lang/cargo#10620) - dedupe toml_edit crate, followup rust-lang/cargo#10603 (rust-lang/cargo#10619) - Update GitHub Actions actions/checkout@v2 to v3 (rust-lang/cargo#10618) - Integrate snapbox in with cargo-test-support (rust-lang/cargo#10581) - Fix zsh completion (rust-lang/cargo#10613) - Update documentation for workspace inheritance (rust-lang/cargo#10611)
| -rw-r--r-- | Cargo.lock | 3 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 2 insertions, 1 deletions
diff --git a/Cargo.lock b/Cargo.lock index 94832a24409..4bc35ee5a0c 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -448,9 +448,10 @@ dependencies = [ "lazy_static", "remove_dir_all", "serde_json", + "snapbox", "tar", "termcolor", - "toml_edit 0.13.4", + "toml_edit 0.14.3", "url 2.2.2", ] diff --git a/src/tools/cargo b/src/tools/cargo -Subproject f63f23ff1f1a12ede8585bbd1bbf0c536e50293 +Subproject a44758ac805600edbb6ba51e7e6fb81a6077c0c |