Skip to content

Commit

Permalink
Auto merge of #95103 - ehuss:update-cargo, r=ehuss
Browse files Browse the repository at this point in the history 
Update cargo

9 commits in 65c82664263feddc5fe2d424be0993c28d46377a..109bfbd055325ef87a6e7f63d67da7e838f8300b
2022-03-09 02:32:56 +0000 to 2022-03-17 21:43:09 +0000
- Refactor RegistryData::load to handle management of the index cache (rust-lang/cargo#10482)
- Separate VCS command paths with "--" (rust-lang/cargo#10483)
- Fix panic when artifact target is used for `[target.'cfg(<target>)'.dependencies` (rust-lang/cargo#10433)
- Bump git2@0.14.2 and libgit2-sys@0.13.2 (rust-lang/cargo#10479)
- vendor: Don't allow multiple values for --sync (rust-lang/cargo#10448)
- Use types to make clere (credential process || token) (rust-lang/cargo#10471)
- Warning on conflicting keys (rust-lang/cargo#10316)
- Registry functions return Poll to enable parallel fetching of index data (rust-lang/cargo#10064)
- Refine the contributor guide (rust-lang/cargo#10468)
  • Loading branch information
@bors
bors committed Mar 19, 2022
2 parents 9c7f6d6 + 5b4f920 commit 8d60bf4
Show file tree
Hide file tree
Showing 2 changed files with 5 additions and 5 deletions.
8 changes: 4 additions & 4 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1502,9 +1502,9 @@ dependencies = [

[[package]]
name = "git2"
version = "0.14.1"
version = "0.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e7d3b96ec1fcaa8431cf04a4f1ef5caafe58d5cf7bcc31f09c1626adddb0ffe"
checksum = "3826a6e0e2215d7a41c2bfc7c9244123969273f3476b939a226aac0ab56e9e3c"
dependencies = [
"bitflags",
"libc",
Expand Down Expand Up @@ -1974,9 +1974,9 @@ dependencies = [

[[package]]
name = "libgit2-sys"
version = "0.13.1+1.4.2"
version = "0.13.2+1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "43e598aa7a4faedf1ea1b4608f582b06f0f40211eec551b7ef36019ae3f62def"
checksum = "3a42de9a51a5c12e00fc0e4ca6bc2ea43582fc6418488e8f615e905d886f258b"
dependencies = [
"cc",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 43 files
+11 −0 CONTRIBUTING.md
+2 −2 Cargo.toml
+6 −3 README.md
+1 −1 crates/cargo-test-support/Cargo.toml
+7 −2 crates/resolver-tests/src/lib.rs
+1 −2 src/bin/cargo/commands/vendor.rs
+30 −9 src/cargo/core/compiler/future_incompat.rs
+3 −9 src/cargo/core/compiler/unit_dependencies.rs
+12 −0 src/cargo/core/profiles.rs
+146 −74 src/cargo/core/registry.rs
+56 −20 src/cargo/core/resolver/dep_cache.rs
+23 −7 src/cargo/core/resolver/errors.rs
+17 −10 src/cargo/core/resolver/features.rs
+11 −2 src/cargo/core/resolver/mod.rs
+44 −17 src/cargo/core/source/mod.rs
+1 −1 src/cargo/ops/cargo_package.rs
+9 −3 src/cargo/ops/common_for_install_and_uninstall.rs
+82 −56 src/cargo/ops/registry.rs
+8 −7 src/cargo/ops/registry/auth.rs
+1 −3 src/cargo/ops/resolve.rs
+26 −5 src/cargo/sources/directory.rs
+26 −14 src/cargo/sources/git/source.rs
+33 −14 src/cargo/sources/path.rs
+160 −117 src/cargo/sources/registry/index.rs
+31 −14 src/cargo/sources/registry/local.rs
+71 −67 src/cargo/sources/registry/mod.rs
+99 −32 src/cargo/sources/registry/remote.rs
+27 −11 src/cargo/sources/replaced.rs
+15 −0 src/cargo/util/network.rs
+46 −0 src/cargo/util/toml/mod.rs
+3 −0 src/cargo/util/toml/targets.rs
+4 −0 src/cargo/util/vcs.rs
+13 −0 src/doc/contrib/src/process/working-on-cargo.md
+2 −2 src/doc/man/cargo-vendor.md
+3 −2 src/doc/man/generated_txt/cargo-vendor.txt
+2 −2 src/doc/src/commands/cargo-vendor.md
+2 −2 src/etc/man/cargo-vendor.1
+188 −0 tests/testsuite/artifact_dep.rs
+229 −0 tests/testsuite/build.rs
+40 −0 tests/testsuite/features.rs
+25 −0 tests/testsuite/proc_macro.rs
+2 −1 tests/testsuite/search.rs
+66 −0 tests/testsuite/vendor.rs

0 comments on commit 8d60bf4

Please sign in to comment.