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)
matthiaskrgr · Nov 18, 2022 · 35f8962 · 35f8962
1 parent 70fe5f0
commit 35f8962
Show file tree

Hide file tree

Showing 2 changed files with 15 additions and 5 deletions.
diff --git 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,15 +363,15 @@ dependencies = [
 
 [[package]]
 name = "cargo-credential-macos-keychain"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "cargo-credential",
  "security-framework",
 ]
 
 [[package]]
 name = "cargo-credential-wincred"
-version = "0.1.0"
+version = "0.2.0"
 dependencies = [
  "cargo-credential",
  "winapi",
@@ -1692,6 +1693,15 @@ dependencies = [
  "syn",
 ]
 
+[[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"

diff --git a/src/tools/cargo b/src/tools/cargo
+1 −1		CHANGELOG.md
+1 −0		Cargo.toml
+49 −11		crates/cargo-test-support/src/registry.rs
+10 −2		crates/crates-io/lib.rs
+2 −2		crates/credential/cargo-credential-1password/Cargo.toml
+30 −24		crates/credential/cargo-credential-1password/src/main.rs
+2 −2		crates/credential/cargo-credential-gnome-secret/Cargo.toml
+13 −29		crates/credential/cargo-credential-gnome-secret/src/main.rs
+2 −2		crates/credential/cargo-credential-macos-keychain/Cargo.toml
+6 −6		crates/credential/cargo-credential-macos-keychain/src/main.rs
+2 −2		crates/credential/cargo-credential-wincred/Cargo.toml
+11 −8		crates/credential/cargo-credential-wincred/src/main.rs
+1 −1		crates/credential/cargo-credential/Cargo.toml
+8 −8		crates/credential/cargo-credential/src/lib.rs
+2 −2		src/bin/cargo/commands/install.rs
+2 −2		src/bin/cargo/commands/login.rs
+4 −2		src/bin/cargo/commands/logout.rs
+0 −2		src/bin/cargo/commands/owner.rs
+0 −2		src/bin/cargo/commands/publish.rs
+0 −2		src/bin/cargo/commands/yank.rs
+2 −0		src/cargo/core/features.rs
+13 −2		src/cargo/core/package.rs
+5 −1		src/cargo/core/source/mod.rs
+1 −1		src/cargo/ops/mod.rs
+75 −140		src/cargo/ops/registry.rs
+0 −237		src/cargo/ops/registry/auth.rs
+8 −0		src/cargo/sources/registry/download.rs
+223 −105		src/cargo/sources/registry/http_remote.rs
+20 −4		src/cargo/sources/registry/mod.rs
+7 −1		src/cargo/sources/registry/remote.rs
+489 −0		src/cargo/util/auth.rs
+16 −6		src/cargo/util/command_prelude.rs
+69 −19		src/cargo/util/config/mod.rs
+1 −0		src/cargo/util/mod.rs
+34 −3		src/doc/src/reference/unstable.md
+24 −3		tests/testsuite/alt_registry.rs
+8 −0		tests/testsuite/cargo_features.rs
+20 −20		tests/testsuite/credential_process.rs
+48 −0		tests/testsuite/inheritable_workspace_fields.rs
+1 −1		tests/testsuite/login.rs
+11 −6		tests/testsuite/logout.rs
+1 −0		tests/testsuite/main.rs
+6 −13		tests/testsuite/publish.rs
+7 −1		tests/testsuite/registry.rs
+304 −0		tests/testsuite/registry_auth.rs
+23 −0		tests/testsuite/search.rs