diff options
| author | Matthias Krüger <matthias.krueger@famsik.de> | 2022-11-19 15:35:22 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-11-19 15:35:22 +0100 |
| commit | c916a8df53eb137ffbfe8dada1b0721a0bbdb43a (patch) | |
| tree | 8f703287cc5824b17da06aeded0bbdc02c03be05 | |
| parent | e2dcc28d3c64a3f8f4797132420685e2b26fe05b (diff) | |
| parent | 35f8962ceee84fe330e95a5ac1efd8f62888ce51 (diff) | |
| download | rust-c916a8df53eb137ffbfe8dada1b0721a0bbdb43a.tar.gz rust-c916a8df53eb137ffbfe8dada1b0721a0bbdb43a.zip | |
Rollup merge of #104587 - weihanglo:update-cargo, r=weihanglo
Update cargo 3 commits in 16b097879b6f117c8ae698aab054c87f26ff325e..eb5d35917b2395194593c9ca70c3778f60c1573b 2022-11-14 23:28:16 +0000 to 2022-11-17 22:08:43 +0000 - Fix several tests that are waiting 60 seconds for publishing to time out (rust-lang/cargo#11388) - Implement RFC 3139: alternative registry authentication support (rust-lang/cargo#10592) - Fix cargo install --index when used with registry.default (rust-lang/cargo#11302) r? `@ghost`
| -rw-r--r-- | Cargo.lock | 18 | ||||
| m--------- | src/tools/cargo | 0 |
2 files changed, 14 insertions, 4 deletions
diff --git a/Cargo.lock b/Cargo.lock index 83d12d710ed..87a4124e7db 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -307,6 +307,7 @@ dependencies = [ "glob", "hex 0.4.2", "home", + "http-auth", "humantime 2.0.1", "ignore", "im-rc", @@ -349,11 +350,11 @@ dependencies = [ [[package]] name = "cargo-credential" -version = "0.1.0" +version = "0.2.0" [[package]] name = "cargo-credential-1password" -version = "0.1.0" +version = "0.2.0" dependencies = [ "cargo-credential", "serde", @@ -362,7 +363,7 @@ dependencies = [ [[package]] name = "cargo-credential-macos-keychain" -version = "0.1.0" +version = "0.2.0" dependencies = [ "cargo-credential", "security-framework", @@ -370,7 +371,7 @@ dependencies = [ [[package]] name = "cargo-credential-wincred" -version = "0.1.0" +version = "0.2.0" dependencies = [ "cargo-credential", "winapi", @@ -1693,6 +1694,15 @@ dependencies = [ ] [[package]] +name = "http-auth" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c0b40b39d66c28829a0cf4d09f7e139ff8201f7500a5083732848ed3b4b4d850" +dependencies = [ + "memchr", +] + +[[package]] name = "humantime" version = "1.3.0" source = "registry+https://github.com/rust-lang/crates.io-index" diff --git a/src/tools/cargo b/src/tools/cargo -Subproject 16b097879b6f117c8ae698aab054c87f26ff325 +Subproject eb5d35917b2395194593c9ca70c3778f60c1573 |