Skip to content

Commit

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

7 commits in eb5d35917b2395194593c9ca70c3778f60c1573b..ba607b23db8398723d659249d9abf5536bc322e5 2022-11-17 22:08:43 +0000 to 2022-11-22 20:52:39 +0000

- Fix failure to parse rustc's JSON output if it is too nested (rust-lang/cargo#11368)
- Add suggestions when `cargo add` multiple packages (rust-lang/cargo#11186)
- Update mod.rs (rust-lang/cargo#11395)
- Fix typo `try use` -> `try to use` (rust-lang/cargo#11394)
- Add warning when `cargo tree -i <spec>` can not find packages (rust-lang/cargo#11377)
- Clean profile, patch, and replace in cargo remove (rust-lang/cargo#11194)
- chore: Upgrade miow (rust-lang/cargo#11391)
  • Loading branch information
bors committed Nov 23, 2022
2 parents 604d521 + 8a808dc commit 008bc1d
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 54 deletions.
63 changes: 10 additions & 53 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -446,7 +446,7 @@ dependencies = [
"jobserver",
"libc",
"log",
"miow 0.4.0",
"miow 0.5.0",
"same-file",
"shell-escape",
"tempfile",
Expand Down Expand Up @@ -2311,11 +2311,11 @@ dependencies = [

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

[[package]]
Expand Down Expand Up @@ -2592,7 +2592,7 @@ dependencies = [
"libc",
"redox_syscall",
"smallvec",
"windows-sys 0.42.0",
"windows-sys",
]

[[package]]
Expand Down Expand Up @@ -5561,32 +5561,19 @@ 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.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
dependencies = [
"windows_aarch64_gnullvm",
"windows_aarch64_msvc 0.42.0",
"windows_i686_gnu 0.42.0",
"windows_i686_msvc 0.42.0",
"windows_x86_64_gnu 0.42.0",
"windows_aarch64_msvc",
"windows_i686_gnu",
"windows_i686_msvc",
"windows_x86_64_gnu",
"windows_x86_64_gnullvm",
"windows_x86_64_msvc 0.42.0",
"windows_x86_64_msvc",
]

[[package]]
Expand All @@ -5595,48 +5582,24 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"

[[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.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"

[[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.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"

[[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.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"

[[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.42.0"
Expand All @@ -5649,12 +5612,6 @@ version = "0.42.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"

[[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.42.0"
Expand Down
2 changes: 1 addition & 1 deletion src/tools/cargo
Submodule cargo updated 30 files
+1 −1 crates/cargo-util/Cargo.toml
+193 −30 src/bin/cargo/commands/remove.rs
+3 −3 src/cargo/core/compiler/build_context/mod.rs
+21 −3 src/cargo/core/compiler/mod.rs
+26 −8 src/cargo/ops/cargo_add/mod.rs
+9 −1 src/cargo/ops/tree/mod.rs
+35 −0 tests/testsuite/cargo_add/git_inferred_name_multiple/mod.rs
+4 −1 tests/testsuite/cargo_add/git_inferred_name_multiple/stderr.log
+72 −0 tests/testsuite/cargo_remove/gc_patch/mod.rs
+9 −0 tests/testsuite/cargo_remove/gc_patch/out/Cargo.toml
+0 −0 tests/testsuite/cargo_remove/gc_patch/out/src/lib.rs
+3 −0 tests/testsuite/cargo_remove/gc_patch/stderr.log
+0 −0 tests/testsuite/cargo_remove/gc_patch/stdout.log
+36 −0 tests/testsuite/cargo_remove/gc_profile/in/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/gc_profile/in/src/lib.rs
+25 −0 tests/testsuite/cargo_remove/gc_profile/mod.rs
+32 −0 tests/testsuite/cargo_remove/gc_profile/out/Cargo.toml
+2 −0 tests/testsuite/cargo_remove/gc_profile/stderr.log
+0 −0 tests/testsuite/cargo_remove/gc_profile/stdout.log
+5 −0 tests/testsuite/cargo_remove/gc_replace/in/Cargo.toml
+26 −0 tests/testsuite/cargo_remove/gc_replace/in/my-package/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/gc_replace/in/my-package/src/main.rs
+25 −0 tests/testsuite/cargo_remove/gc_replace/mod.rs
+2 −0 tests/testsuite/cargo_remove/gc_replace/out/Cargo.toml
+25 −0 tests/testsuite/cargo_remove/gc_replace/out/my-package/Cargo.toml
+1 −0 tests/testsuite/cargo_remove/gc_replace/out/my-package/src/main.rs
+2 −0 tests/testsuite/cargo_remove/gc_replace/stderr.log
+0 −0 tests/testsuite/cargo_remove/gc_replace/stdout.log
+3 −0 tests/testsuite/cargo_remove/mod.rs
+56 −0 tests/testsuite/tree.rs

0 comments on commit 008bc1d

Please sign in to comment.