Skip to content

Commit

Permalink
Rollup merge of #98207 - arlosi:update-cargo, r=Dylan-DPC
Browse files Browse the repository at this point in the history 
Update cargo

4 commits in 4d92f07f34ba7fb7d7f207564942508f46c225d3..8d42b0e8794ce3787c9f7d6d88b02ae80ebe8d19
2022-06-10 01:11:04 +0000 to 2022-06-17 16:46:26 +0000
- Use specific terminology for sparse HTTP-based registry (rust-lang/cargo#10764)
- chore: Upgrade to clap 3.2 (rust-lang/cargo#10753)
- Improve testing framework for http registries (rust-lang/cargo#10738)
- doc: Improve example of using the links field (rust-lang/cargo#10728)
  • Loading branch information
@matthiaskrgr
matthiaskrgr authored Jun 18, 2022
2 parents f351f34 + b59abdc commit d13bead
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 23 deletions.
48 changes: 27 additions & 21 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ dependencies = [
"cargo-test-macro",
"cargo-test-support",
"cargo-util",
"clap 3.1.1",
"clap 3.2.5",
"crates-io",
"crossbeam-utils",
"curl",
Expand Down Expand Up @@ -470,7 +470,7 @@ dependencies = [

[[package]]
name = "cargo-util"
version = "0.1.3"
version = "0.1.4"
dependencies = [
"anyhow",
"core-foundation",
Expand Down Expand Up @@ -615,19 +615,19 @@ dependencies = [

[[package]]
name = "clap"
version = "3.1.1"
version = "3.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6d76c22c9b9b215eeb8d016ad3a90417bd13cb24cf8142756e6472445876cab7"
checksum = "d53da17d37dba964b9b3ecb5c5a1f193a2762c700e6829201e645b9381c99dc7"
dependencies = [
"atty",
"bitflags",
"clap_derive",
"clap_lex",
"indexmap",
"lazy_static",
"os_str_bytes",
"once_cell",
"strsim 0.10.0",
"termcolor",
"textwrap 0.14.2",
"textwrap 0.15.0",
]

[[package]]
Expand All @@ -636,14 +636,14 @@ version = "3.1.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "df6f3613c0a3cddfd78b41b10203eb322cb29b600cbdf808a7d3db95691b8e25"
dependencies = [
"clap 3.1.1",
"clap 3.2.5",
]

[[package]]
name = "clap_derive"
version = "3.1.18"
version = "3.2.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "25320346e922cffe59c0bbc5410c8d8784509efb321488971081313cb1e1a33c"
checksum = "c11d40217d16aee8508cc8e5fde8b4ff24639758608e5374e731b53f85749fb9"
dependencies = [
"heck 0.4.0",
"proc-macro-error",
Expand All @@ -652,6 +652,15 @@ dependencies = [
"syn",
]

[[package]]
name = "clap_lex"
version = "0.2.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5538cd660450ebeb4234cfecf8f2284b844ffc4c50531e66d584ad5b91293613"
dependencies = [
"os_str_bytes",
]

[[package]]
name = "clippy"
version = "0.1.63"
Expand Down Expand Up @@ -684,7 +693,7 @@ name = "clippy_dev"
version = "0.0.1"
dependencies = [
"aho-corasick",
"clap 3.1.1",
"clap 3.2.5",
"indoc",
"itertools",
"opener",
Expand Down Expand Up @@ -2334,7 +2343,7 @@ dependencies = [
"ammonia",
"anyhow",
"chrono",
"clap 3.1.1",
"clap 3.2.5",
"clap_complete",
"elasticlunr-rs",
"env_logger 0.7.1",
Expand Down Expand Up @@ -2572,9 +2581,9 @@ dependencies = [

[[package]]
name = "once_cell"
version = "1.10.0"
version = "1.12.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "87f3e037eac156d1775da914196f0f37741a274155e34a0b7e427c35d2a2ecb9"
checksum = "7709cef83f0c1f58f666e746a08b21e0085f7440fa6a29cc194d68aac97a4225"

[[package]]
name = "opaque-debug"
Expand Down Expand Up @@ -2657,9 +2666,6 @@ name = "os_str_bytes"
version = "6.0.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8e22443d1643a904602595ba1cd8f7d896afe56d26712531c5ff73a15b2fbf64"
dependencies = [
"memchr",
]

[[package]]
name = "output_vt100"
Expand Down Expand Up @@ -3515,7 +3521,7 @@ version = "1.0.0"
dependencies = [
"bstr",
"byteorder",
"clap 3.1.1",
"clap 3.2.5",
"crossbeam-utils",
"libc",
"libz-sys",
Expand Down Expand Up @@ -4696,7 +4702,7 @@ dependencies = [
"anyhow",
"bytecount",
"cargo_metadata",
"clap 3.1.1",
"clap 3.2.5",
"derive-new",
"diff",
"dirs",
Expand Down Expand Up @@ -5259,9 +5265,9 @@ dependencies = [

[[package]]
name = "textwrap"
version = "0.14.2"
version = "0.15.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "0066c8d12af8b5acd21e00547c3797fde4e8677254a7ee429176ccebbe93dd80"
checksum = "b1141d4d61095b28419e22cb0bbf02755f5e54e0526f97f1e3d1d160e60885fb"

[[package]]
name = "thiserror"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 55 files
+1 −1 CHANGELOG.md
+1 −1 Cargo.toml
+10 −1 crates/cargo-test-support/src/lib.rs
+496 −311 crates/cargo-test-support/src/registry.rs
+1 −1 crates/cargo-util/Cargo.toml
+19 −5 crates/cargo-util/src/process_builder.rs
+51 −46 src/bin/cargo/cli.rs
+32 −40 src/bin/cargo/commands/add.rs
+7 −7 src/bin/cargo/commands/bench.rs
+4 −1 src/bin/cargo/commands/check.rs
+2 −2 src/bin/cargo/commands/clean.rs
+7 −7 src/bin/cargo/commands/config.rs
+9 −6 src/bin/cargo/commands/doc.rs
+31 −37 src/bin/cargo/commands/fix.rs
+19 −19 src/bin/cargo/commands/install.rs
+3 −3 src/bin/cargo/commands/locate_project.rs
+2 −2 src/bin/cargo/commands/login.rs
+1 −1 src/bin/cargo/commands/logout.rs
+4 −4 src/bin/cargo/commands/metadata.rs
+2 −2 src/bin/cargo/commands/new.rs
+9 −9 src/bin/cargo/commands/owner.rs
+8 −8 src/bin/cargo/commands/package.rs
+4 −1 src/bin/cargo/commands/pkgid.rs
+6 −6 src/bin/cargo/commands/publish.rs
+1 −1 src/bin/cargo/commands/report.rs
+2 −2 src/bin/cargo/commands/run.rs
+2 −2 src/bin/cargo/commands/rustc.rs
+2 −2 src/bin/cargo/commands/rustdoc.rs
+5 −1 src/bin/cargo/commands/search.rs
+11 −11 src/bin/cargo/commands/test.rs
+30 −33 src/bin/cargo/commands/tree.rs
+4 −3 src/bin/cargo/commands/uninstall.rs
+6 −6 src/bin/cargo/commands/update.rs
+30 −46 src/bin/cargo/commands/vendor.rs
+1 −1 src/bin/cargo/commands/version.rs
+8 −5 src/bin/cargo/commands/yank.rs
+3 −3 src/cargo/core/features.rs
+3 −3 src/cargo/core/source/source_id.rs
+1 −1 src/cargo/ops/cargo_config.rs
+3 −3 src/cargo/sources/config.rs
+2 −2 src/cargo/sources/registry/http_remote.rs
+102 −88 src/cargo/util/command_prelude.rs
+4 −1 src/doc/src/reference/manifest.md
+7 −7 src/doc/src/reference/unstable.md
+2 −16 tests/testsuite/alt_registry.rs
+0 −5 tests/testsuite/cargo_add/invalid_target_empty/stderr.log
+38 −36 tests/testsuite/credential_process.rs
+3 −2 tests/testsuite/install.rs
+7 −24 tests/testsuite/login.rs
+1 −1 tests/testsuite/logout.rs
+4 −3 tests/testsuite/old_cargos.rs
+2 −2 tests/testsuite/package.rs
+52 −33 tests/testsuite/publish.rs
+13 −50 tests/testsuite/registry.rs
+78 −131 tests/testsuite/search.rs
2 changes: 1 addition & 1 deletion src/tools/rustc-workspace-hack/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ features = [
[dependencies]
bstr = { version = "0.2.13", features = ["default"] }
byteorder = { version = "1", features = ['default', 'std'] }
clap = { version = "3.1.1", features = ["lazy_static", "derive", "clap_derive"]}
clap = { version = "3.1.1", features = ["derive", "clap_derive"]}
curl-sys = { version = "0.4.13", features = ["http2", "libnghttp2-sys"], optional = true }
crossbeam-utils = { version = "0.8.0", features = ["nightly"] }
libc = { version = "0.2.79", features = ["align"] }
Expand Down

0 comments on commit d13bead

Please sign in to comment.