Skip to content

Commit

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

6 commits in d5336f813df39d476e61fc46daabb1446350660a..b4ddf95ad9954118ac0dae835f2966394ad04c02
2023-09-14 19:55:49 +0000 to 2023-09-18 03:48:09 +0000
- doc: differentiate defaults for split-debuginfo (rust-lang/cargo#12680)
- feat(cli): Add '-n' to dry-run (rust-lang/cargo#12660)
- feat: stabilize credential-process and registry-auth (rust-lang/cargo#12649)
- refactor: use `RegistryOrIndex` enum to replace two booleans (rust-lang/cargo#12677)
- doc: clarify caret requirements (rust-lang/cargo#12679)
- feat(pkgid): Allow incomplete versions when unambigious (rust-lang/cargo#12614)

r? ghost
  • Loading branch information
@bors
bors committed Sep 18, 2023
2 parents 24bb884 + 1d65446 commit 078eb11
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 86 files
+1 −1 Cargo.lock
+5 −5 crates/resolver-tests/src/lib.rs
+14 −3 credential/cargo-credential-1password/README.md
+4 −2 credential/cargo-credential-libsecret/README.md
+1 −1 credential/cargo-credential-macos-keychain/Cargo.toml
+5 −2 credential/cargo-credential-macos-keychain/README.md
+4 −2 credential/cargo-credential-wincred/README.md
+1 −1 credential/cargo-credential/README.md
+5 −0 publish.py
+1 −1 src/bin/cargo/commands/init.rs
+5 −4 src/bin/cargo/commands/install.rs
+12 −6 src/bin/cargo/commands/login.rs
+11 −4 src/bin/cargo/commands/logout.rs
+1 −1 src/bin/cargo/commands/new.rs
+3 −5 src/bin/cargo/commands/owner.rs
+4 −6 src/bin/cargo/commands/publish.rs
+1 −1 src/bin/cargo/commands/remove.rs
+4 −5 src/bin/cargo/commands/search.rs
+3 −6 src/bin/cargo/commands/yank.rs
+8 −4 src/cargo/core/features.rs
+6 −6 src/cargo/core/manifest.rs
+4 −4 src/cargo/core/package.rs
+50 −17 src/cargo/core/package_id_spec.rs
+6 −5 src/cargo/core/resolver/dep_cache.rs
+2 −2 src/cargo/core/resolver/mod.rs
+2 −2 src/cargo/core/resolver/version_prefs.rs
+5 −5 src/cargo/core/summary.rs
+2 −2 src/cargo/core/workspace.rs
+1 −3 src/cargo/lib.rs
+3 −3 src/cargo/ops/cargo_add/mod.rs
+1 −1 src/cargo/ops/cargo_clean.rs
+2 −2 src/cargo/ops/cargo_package.rs
+1 −0 src/cargo/ops/mod.rs
+11 −4 src/cargo/ops/registry/login.rs
+3 −2 src/cargo/ops/registry/logout.rs
+25 −12 src/cargo/ops/registry/mod.rs
+4 −4 src/cargo/ops/registry/owner.rs
+14 −5 src/cargo/ops/registry/publish.rs
+4 −3 src/cargo/ops/registry/search.rs
+4 −4 src/cargo/ops/registry/yank.rs
+4 −4 src/cargo/ops/resolve.rs
+1 −0 src/cargo/sources/registry/download.rs
+3 −11 src/cargo/sources/registry/http_remote.rs
+2 −2 src/cargo/sources/registry/index.rs
+1 −4 src/cargo/sources/registry/remote.rs
+38 −15 src/cargo/util/auth/mod.rs
+28 −14 src/cargo/util/command_prelude.rs
+1 −1 src/cargo/util/mod.rs
+131 −32 src/cargo/util/semver_ext.rs
+16 −15 src/cargo/util/toml/mod.rs
+18 −7 src/doc/man/cargo-login.md
+9 −3 src/doc/man/cargo-logout.md
+19 −7 src/doc/man/generated_txt/cargo-login.txt
+10 −3 src/doc/man/generated_txt/cargo-logout.txt
+2 −0 src/doc/src/SUMMARY.md
+18 −7 src/doc/src/commands/cargo-login.md
+9 −3 src/doc/src/commands/cargo-logout.md
+70 −1 src/doc/src/reference/config.md
+237 −0 src/doc/src/reference/credential-provider-protocol.md
+6 −0 src/doc/src/reference/environment-variables.md
+2 −0 src/doc/src/reference/pkgid-spec.md
+4 −0 src/doc/src/reference/profiles.md
+6 −0 src/doc/src/reference/registries.md
+111 −0 src/doc/src/reference/registry-authentication.md
+17 −0 src/doc/src/reference/registry-index.md
+11 −2 src/doc/src/reference/specifying-dependencies.md
+14 −288 src/doc/src/reference/unstable.md
+24 −7 src/etc/man/cargo-login.1
+9 −3 src/etc/man/cargo-logout.1
+3 −4 tests/testsuite/alt_registry.rs
+1 −1 tests/testsuite/cargo_add/help/stdout.log
+1 −1 tests/testsuite/cargo_login/help/stdout.log
+2 −2 tests/testsuite/cargo_owner/help/stdout.log
+2 −2 tests/testsuite/cargo_publish/help/stdout.log
+1 −1 tests/testsuite/cargo_remove/help/stdout.log
+2 −2 tests/testsuite/cargo_search/help/stdout.log
+1 −1 tests/testsuite/cargo_update/help/stdout.log
+2 −2 tests/testsuite/cargo_yank/help/stdout.log
+115 −7 tests/testsuite/clean.rs
+20 −95 tests/testsuite/credential_process.rs
+8 −8 tests/testsuite/login.rs
+6 −12 tests/testsuite/pkgid.rs
+54 −0 tests/testsuite/profile_overrides.rs
+42 −0 tests/testsuite/publish.rs
+12 −10 tests/testsuite/registry_auth.rs
+2 −4 tests/testsuite/search.rs

0 comments on commit 078eb11

Please sign in to comment.