Skip to content

Commit

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

11 commits in 4a3c588b1f0a8e2dc8dd8789dbf3b6a71b02ed49..15d090969743630bff549a1b068bcaa8174e5ee3
2023-03-14 14:05:36 +0000 to 2023-03-21 17:54:28 +0000
- docs(contrib): Move higher level resolver docs into doc comments (rust-lang/cargo#11870)
- docs(contrib): Pull impl info out of architecture (rust-lang/cargo#11869)
- Update curl-sys (rust-lang/cargo#11871)
- Poll loop fixes (rust-lang/cargo#11624)
- clippy: warn `disallowed_methods` for `std::env::var` and friends (rust-lang/cargo#11828)
- Add --ignore-rust-version flag to cargo install (rust-lang/cargo#11859)
- Handle case mismatches when looking up env vars in the Config snapshot (rust-lang/cargo#11824)
- align semantics of generated vcs ignore files (rust-lang/cargo#11855)
- Add more information to wait-for-publish (rust-lang/cargo#11713)
- docs: Address warnings (rust-lang/cargo#11856)
- docs(contrib): Create a file overview in the nightly docs (rust-lang/cargo#11850)
  • Loading branch information
bors committed Mar 22, 2023
2 parents 1db9c06 + 30cef3a commit 6dc3999
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
4 changes: 2 additions & 2 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -1128,9 +1128,9 @@ dependencies = [

[[package]]
name = "curl-sys"
version = "0.4.59+curl-7.86.0"
version = "0.4.61+curl-8.0.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407"
checksum = "14d05c10f541ae6f3bc5b3d923c20001f47db7d5f0b2bc6ad16490133842db79"
dependencies = [
"cc",
"libc",
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 71 files
+1 −1 Cargo.toml
+6 −4 build.rs
+6 −0 clippy.toml
+2 −0 crates/cargo-test-support/src/compare.rs
+1 −1 crates/cargo-test-support/src/publish.rs
+80 −45 crates/cargo-test-support/src/registry.rs
+12 −5 crates/cargo-util/src/read2.rs
+3 −0 src/bin/cargo/cli.rs
+1 −0 src/bin/cargo/commands/install.rs
+1 −0 src/bin/cargo/main.rs
+8 −0 src/cargo/core/compiler/custom_build.rs
+14 −4 src/cargo/core/compiler/fingerprint/mod.rs
+1 −1 src/cargo/core/compiler/mod.rs
+16 −4 src/cargo/core/features.rs
+12 −1 src/cargo/core/resolver/mod.rs
+6 −0 src/cargo/core/resolver/types.rs
+2 −0 src/cargo/core/shell.rs
+11 −0 src/cargo/core/source/mod.rs
+8 −3 src/cargo/core/source/source_id.rs
+29 −2 src/cargo/lib.rs
+1 −1 src/cargo/ops/cargo_new.rs
+36 −17 src/cargo/ops/fix.rs
+1 −1 src/cargo/ops/mod.rs
+36 −20 src/cargo/ops/registry.rs
+49 −4 src/cargo/ops/resolve.rs
+5 −1 src/cargo/sources/directory.rs
+12 −4 src/cargo/sources/git/source.rs
+4 −0 src/cargo/sources/path.rs
+18 −7 src/cargo/sources/registry/http_remote.rs
+9 −1 src/cargo/sources/registry/local.rs
+7 −0 src/cargo/sources/registry/mod.rs
+11 −3 src/cargo/sources/registry/remote.rs
+4 −0 src/cargo/sources/replaced.rs
+1 −1 src/cargo/util/config/de.rs
+189 −0 src/cargo/util/config/environment.rs
+21 −47 src/cargo/util/config/mod.rs
+3 −0 src/cargo/util/job.rs
+2 −0 src/cargo/util/profile.rs
+84 −0 src/cargo/util/progress.rs
+6 −2 src/doc/contrib/src/SUMMARY.md
+1 −65 src/doc/contrib/src/architecture/files.md
+1 −0 src/doc/contrib/src/architecture/filesystem.md
+1 −90 src/doc/contrib/src/architecture/packages.md
+5 −0 src/doc/contrib/src/implementation/architecture.md
+0 −24 src/doc/contrib/src/implementation/console.md
+26 −0 src/doc/contrib/src/implementation/debugging.md
+21 −0 src/doc/contrib/src/implementation/filesystem.md
+6 −0 src/doc/contrib/src/implementation/index.md
+1 −1 src/doc/contrib/src/implementation/subcommands.md
+2 −0 src/doc/man/cargo-install.md
+5 −0 src/doc/man/generated_txt/cargo-install.txt
+6 −0 src/doc/src/commands/cargo-install.md
+11 −1 src/etc/_cargo
+10 −10 src/etc/cargo.bashcomp.sh
+6 −0 src/etc/man/cargo-install.1
+12 −3 tests/testsuite/alt_registry.rs
+4 −1 tests/testsuite/artifact_dep.rs
+26 −0 tests/testsuite/cargo_command.rs
+4 −1 tests/testsuite/cargo_features.rs
+25 −0 tests/testsuite/config.rs
+8 −2 tests/testsuite/credential_process.rs
+4 −1 tests/testsuite/cross_publish.rs
+8 −2 tests/testsuite/features_namespaced.rs
+20 −5 tests/testsuite/inheritable_workspace_fields.rs
+1 −1 tests/testsuite/init/mercurial_autodetect/out/.hgignore
+1 −1 tests/testsuite/init/simple_hg/out/.hgignore
+1 −1 tests/testsuite/init/simple_hg_ignore_exists/out/.hgignore
+17 −0 tests/testsuite/new.rs
+218 −29 tests/testsuite/publish.rs
+4 −1 tests/testsuite/source_replacement.rs
+4 −1 tests/testsuite/weak_dep_features.rs

0 comments on commit 6dc3999

Please sign in to comment.