Skip to content

Commit

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

20 commits in 7e484fc1a766f56dbc95380f45719698e0c82749..9286a1beba5b28b115bad67de2ae91fb1c61eb0b 2022-10-27 15:20:57 +0000 to 2022-11-04 06:41:49 +0000
- chore: Upgrade dependencies (rust-lang/cargo#11328)
- Clean more aggressively in CI (rust-lang/cargo#11335)
- Remove remove_dir_all (rust-lang/cargo#11333)
- test(publish): Cover more wait-for-publish cases (rust-lang/cargo#11327)
- Revert rust-lang/cargo#11183 (rust-lang/cargo#11331)
- fix(semver-check): adapt to a different error for variant not covered (rust-lang/cargo#11332)
- Update curl-sys (rust-lang/cargo#11326)
- Mention fix on build script deadlock (rust-lang/cargo#11325)
- Make cargo forward pre-existing CARGO if set (rust-lang/cargo#11285)
- Clean up workspace dependencies after cargo remove (rust-lang/cargo#11242)
- Update the outdated link for rust-semverver (rust-lang/cargo#11322)
- Fix broken link to compilation entry point (rust-lang/cargo#11317)
- Only remove fingerprints and build script artifacts of the requested package (rust-lang/cargo#10621)
- Newer anyhow features are required (rust-lang/cargo#11316)
- Clean stale git temp files (rust-lang/cargo#11308)
- Report crate size on package and publish (rust-lang/cargo#11270)
- add a note that some warnings (and/or errors) can be auto-fixed (rust-lang/cargo#10989)
- Update libcurl (rust-lang/cargo#11307)
- artifact deps shoud works when target field specified coexists with `optional = true` (rust-lang/cargo#11183)
- Fix singular verb in tests page (rust-lang/cargo#11300)

r? `@ghost`
  • Loading branch information
bors committed Nov 5, 2022
2 parents aebf7c4 + bfce227 commit 5b3e909
Show file tree
Hide file tree
Showing 2 changed files with 72 additions and 21 deletions.
91 changes: 71 additions & 20 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -427,7 +427,6 @@ dependencies = [
"glob",
"itertools",
"lazy_static",
"remove_dir_all",
"serde_json",
"snapbox",
"tar",
Expand All @@ -449,7 +448,7 @@ dependencies = [
"jobserver",
"libc",
"log",
"miow",
"miow 0.4.0",
"same-file",
"shell-escape",
"tempfile",
Expand Down Expand Up @@ -815,7 +814,7 @@ dependencies = [
"lazy_static",
"lazycell",
"libc",
"miow",
"miow 0.3.7",
"miropt-test-tools",
"regex",
"rustfix",
Expand All @@ -840,7 +839,7 @@ dependencies = [
"lazy_static",
"libc",
"log",
"miow",
"miow 0.3.7",
"regex",
"rustfix",
"serde",
Expand All @@ -853,9 +852,9 @@ dependencies = [

[[package]]
name = "concolor"
version = "0.0.8"
version = "0.0.9"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "015267563b1df20adccdd00cb05257b1dfbea70a04928e9cf88ffb850c1a40af"
checksum = "b90f9dcd9490a97db91a85ccd79e38a87e14323f0bb824659ee3274e9143ba37"
dependencies = [
"atty",
"bitflags",
Expand All @@ -864,9 +863,9 @@ dependencies = [

[[package]]
name = "concolor-query"
version = "0.0.5"
version = "0.1.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "d6417fe6fc03a8b533fd2177742eeb39a90c7233eedec7bac96d4d6b69a09449"
checksum = "82a90734b3d5dcf656e7624cca6bce9c3a90ee11f900e80141a7427ccfb3d317"

[[package]]
name = "content_inspector"
Expand Down Expand Up @@ -1036,9 +1035,9 @@ dependencies = [

[[package]]
name = "curl"
version = "0.4.43"
version = "0.4.44"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37d855aeef205b43f65a5001e0997d81f8efca7badad4fad7d897aa7f0d0651f"
checksum = "509bd11746c7ac09ebd19f0b17782eae80aadee26237658a6b4808afb5c11a22"
dependencies = [
"curl-sys",
"libc",
Expand All @@ -1051,9 +1050,9 @@ dependencies = [

[[package]]
name = "curl-sys"
version = "0.4.55+curl-7.83.1"
version = "0.4.59+curl-7.86.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "23734ec77368ec583c2e61dd3f0b0e5c98b93abe6d2a004ca06b91dd7e3e2762"
checksum = "6cfce34829f448b08f55b7db6d0009e23e2e86a34e8c2b366269bf5799b4a407"
dependencies = [
"cc",
"libc",
Expand Down Expand Up @@ -2257,6 +2256,15 @@ dependencies = [
"winapi",
]

[[package]]
name = "miow"
version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a7377f7792b3afb6a3cba68daa54ca23c032137010460d667fda53a8d66be00e"
dependencies = [
"windows-sys 0.28.0",
]

[[package]]
name = "miri"
version = "0.1.0"
Expand Down Expand Up @@ -2541,7 +2549,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
"windows-sys",
"windows-sys 0.36.1",
]

[[package]]
Expand Down Expand Up @@ -4628,9 +4636,9 @@ checksum = "da73c8f77aebc0e40c300b93f0a5f1bece7a248a36eee287d4e095f35c7b7d6e"

[[package]]
name = "snapbox"
version = "0.3.3"
version = "0.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "44d199ccf8f606592df2d145db26f2aa45344e23c64b074cc5a4047f1d99b0f7"
checksum = "827c00e91b15e2674d8a5270bae91f898693cbf9561cbb58d8eaa31974597293"
dependencies = [
"concolor",
"content_inspector",
Expand Down Expand Up @@ -5475,43 +5483,86 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"

[[package]]
name = "windows-sys"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "82ca39602d5cbfa692c4b67e3bcbb2751477355141c1ed434c94da4186836ff6"
dependencies = [
"windows_aarch64_msvc 0.28.0",
"windows_i686_gnu 0.28.0",
"windows_i686_msvc 0.28.0",
"windows_x86_64_gnu 0.28.0",
"windows_x86_64_msvc 0.28.0",
]

[[package]]
name = "windows-sys"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
dependencies = [
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_msvc",
"windows_aarch64_msvc 0.36.1",
"windows_i686_gnu 0.36.1",
"windows_i686_msvc 0.36.1",
"windows_x86_64_gnu 0.36.1",
"windows_x86_64_msvc 0.36.1",
]

[[package]]
name = "windows_aarch64_msvc"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2"

[[package]]
name = "windows_aarch64_msvc"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"

[[package]]
name = "windows_i686_gnu"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a"

[[package]]
name = "windows_i686_gnu"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"

[[package]]
name = "windows_i686_msvc"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64"

[[package]]
name = "windows_i686_msvc"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"

[[package]]
name = "windows_x86_64_gnu"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954"

[[package]]
name = "windows_x86_64_gnu"
version = "0.36.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"

[[package]]
name = "windows_x86_64_msvc"
version = "0.28.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f"

[[package]]
name = "windows_x86_64_msvc"
version = "0.36.1"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 73 files
+8 −1 .github/workflows/main.yml
+2 −0 CHANGELOG.md
+4 −4 Cargo.toml
+1 −2 crates/cargo-test-support/Cargo.toml
+1 −0 crates/cargo-test-support/src/compare.rs
+6 −2 crates/cargo-test-support/src/lib.rs
+1 −1 crates/cargo-test-support/src/paths.rs
+1 −1 crates/cargo-util/Cargo.toml
+53 −0 src/bin/cargo/commands/remove.rs
+123 −18 src/cargo/core/compiler/job_queue.rs
+16 −1 src/cargo/core/compiler/mod.rs
+46 −2 src/cargo/ops/cargo_clean.rs
+29 −4 src/cargo/ops/cargo_package.rs
+18 −0 src/cargo/ops/registry.rs
+1 −1 src/cargo/ops/registry/auth.rs
+42 −8 src/cargo/sources/git/utils.rs
+14 −1 src/cargo/util/config/mod.rs
+43 −0 src/cargo/util/mod.rs
+1 −1 src/cargo/util/toml_mut/manifest.rs
+1 −1 src/doc/contrib/src/architecture/codebase.md
+1 −1 src/doc/src/guide/tests.md
+6 −0 src/doc/src/reference/environment-variables.md
+2 −2 src/doc/src/reference/semver.md
+1 −0 tests/testsuite/artifact_dep.rs
+24 −5 tests/testsuite/build_script.rs
+14 −1 tests/testsuite/cargo_command.rs
+3 −0 tests/testsuite/cargo_remove/mod.rs
+5 −0 tests/testsuite/cargo_remove/workspace/in/Cargo.toml
+24 −0 tests/testsuite/cargo_remove/workspace/in/my-package/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/workspace/in/my-package/src/main.rs
+25 −0 tests/testsuite/cargo_remove/workspace/mod.rs
+2 −0 tests/testsuite/cargo_remove/workspace/out/Cargo.toml
+21 −0 tests/testsuite/cargo_remove/workspace/out/my-package/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/workspace/out/my-package/src/main.rs
+2 −0 tests/testsuite/cargo_remove/workspace/stderr.log
+0 −0 tests/testsuite/cargo_remove/workspace/stdout.log
+30 −0 tests/testsuite/cargo_remove/workspace_non_virtual/in/Cargo.toml
+6 −0 tests/testsuite/cargo_remove/workspace_non_virtual/in/my-member/Cargo.toml
+0 −0 tests/testsuite/cargo_remove/workspace_non_virtual/in/my-member/src/main.rs
+25 −0 tests/testsuite/cargo_remove/workspace_non_virtual/mod.rs
+24 −0 tests/testsuite/cargo_remove/workspace_non_virtual/out/Cargo.toml
+6 −0 tests/testsuite/cargo_remove/workspace_non_virtual/out/my-member/Cargo.toml
+0 −0 tests/testsuite/cargo_remove/workspace_non_virtual/out/my-member/src/main.rs
+2 −0 tests/testsuite/cargo_remove/workspace_non_virtual/stderr.log
+0 −0 tests/testsuite/cargo_remove/workspace_non_virtual/stdout.log
+5 −0 tests/testsuite/cargo_remove/workspace_preserved/in/Cargo.toml
+22 −0 tests/testsuite/cargo_remove/workspace_preserved/in/my-other-package/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/workspace_preserved/in/my-other-package/src/main.rs
+24 −0 tests/testsuite/cargo_remove/workspace_preserved/in/my-package/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/workspace_preserved/in/my-package/src/main.rs
+25 −0 tests/testsuite/cargo_remove/workspace_preserved/mod.rs
+5 −0 tests/testsuite/cargo_remove/workspace_preserved/out/Cargo.toml
+22 −0 tests/testsuite/cargo_remove/workspace_preserved/out/my-other-package/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/workspace_preserved/out/my-other-package/src/main.rs
+21 −0 tests/testsuite/cargo_remove/workspace_preserved/out/my-package/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/workspace_preserved/out/my-package/src/main.rs
+2 −0 tests/testsuite/cargo_remove/workspace_preserved/stderr.log
+0 −0 tests/testsuite/cargo_remove/workspace_preserved/stdout.log
+272 −1 tests/testsuite/check.rs
+90 −10 tests/testsuite/clean.rs
+2 −0 tests/testsuite/credential_process.rs
+2 −0 tests/testsuite/cross_publish.rs
+2 −0 tests/testsuite/features_namespaced.rs
+33 −0 tests/testsuite/git.rs
+1 −1 tests/testsuite/git_gc.rs
+38 −0 tests/testsuite/install.rs
+311 −0 tests/testsuite/package.rs
+120 −14 tests/testsuite/publish.rs
+13 −1 tests/testsuite/publish_lockfile.rs
+1 −0 tests/testsuite/registry.rs
+1 −0 tests/testsuite/source_replacement.rs
+13 −0 tests/testsuite/test.rs
+1 −0 tests/testsuite/weak_dep_features.rs

0 comments on commit 5b3e909

Please sign in to comment.