diff options
| author | Eric Huss <eric@huss.org> | 2022-01-31 20:13:02 -0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-01-31 20:13:02 -0800 |
| commit | 81900f469239738d7166ad2022f60182817d57ca (patch) | |
| tree | a633b3aaa0f678eacb0f7ea55e0f8da0ac40c3cf | |
| parent | 06c7d328abd51db41bc7e7f0069af2183d9981cb (diff) | |
| parent | 91aee65c99c1077d7b39561746d2364e6d6d3d60 (diff) | |
| download | rust-81900f469239738d7166ad2022f60182817d57ca.tar.gz rust-81900f469239738d7166ad2022f60182817d57ca.zip | |
Rollup merge of #93533 - ehuss:update-cargo, r=ehuss
Update cargo 10 commits in 1c034752de0df744fcd7788fcbca158830b8bf85..25fcb135d02ea897ce894b67ae021f48107d522b 2022-01-25 22:36:53 +0000 to 2022-02-01 01:32:48 +0000 - fix(install): Keep v1 file formatting the same (rust-lang/cargo#10349) - fix(vendor): Use tables for sample config (rust-lang/cargo#10348) - Add bash completion for `cargo clippy` (rust-lang/cargo#10347) - Do not ignore `--features` when `--all-features` is present (rust-lang/cargo#10337) - test: Fix compatibilty with new toml_edit (rust-lang/cargo#10350) - extra-link-arg-etc: support all link types (credit `@davidhewitt)` (rust-lang/cargo#10274) - Make clippy happy (rust-lang/cargo#10340) - Update publishing link for semver rules. (rust-lang/cargo#10338) - Normalize --path when install bin outside current workspace (rust-lang/cargo#10335) - Bump clap to v3.0.13 (rust-lang/cargo#10336)
| -rw-r--r-- | Cargo.lock | 10 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 5 insertions, 5 deletions
diff --git a/Cargo.lock b/Cargo.lock index dd45d49781a..1e124963d0d 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -337,7 +337,7 @@ dependencies = [ "cargo-test-macro", "cargo-test-support", "cargo-util", - "clap 3.0.10", + "clap 3.0.13", "crates-io", "crossbeam-utils", "curl", @@ -627,9 +627,9 @@ dependencies = [ [[package]] name = "clap" -version = "3.0.10" +version = "3.0.13" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "7a30c3bf9ff12dfe5dae53f0a96e0febcd18420d1c0e7fad77796d9d5c4b5375" +checksum = "08799f92c961c7a1cf0cc398a9073da99e21ce388b46372c37f3191f2f3eed3e" dependencies = [ "atty", "bitflags", @@ -5233,9 +5233,9 @@ dependencies = [ [[package]] name = "toml_edit" -version = "0.13.0" +version = "0.13.4" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "3b80ac5e1b91e3378c63dab121962472b5ca20cf9ab1975e3d588548717807a8" +checksum = "744e9ed5b352340aa47ce033716991b5589e23781acb97cad37d4ea70560f55b" dependencies = [ "combine", "indexmap", diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 1c034752de0df744fcd7788fcbca158830b8bf8 +Subproject 25fcb135d02ea897ce894b67ae021f48107d522 |