Skip to content

Commit 2f29548

Browse files
authored
Rollup merge of rust-lang#64952 - michaelwoerister:update-cargo, r=alexcrichton
Update cargo. Pulls rust-lang/cargo@f3c92ed into nightly Rust. r? @alexcrichton
2 parents 73aa2bd + 8d9abcd commit 2f29548

File tree

4 files changed

+10
-10
lines changed

4 files changed

+10
-10
lines changed

Cargo.lock

+7-8
Original file line numberDiff line numberDiff line change
@@ -265,7 +265,7 @@ dependencies = [
265265

266266
[[package]]
267267
name = "cargo"
268-
version = "0.40.0"
268+
version = "0.41.0"
269269
dependencies = [
270270
"atty",
271271
"bytesize",
@@ -600,7 +600,7 @@ checksum = "e7ca8a5221364ef15ce201e8ed2f609fc312682a8f4e0e3d4aa5879764e0fa3b"
600600

601601
[[package]]
602602
name = "crates-io"
603-
version = "0.28.0"
603+
version = "0.29.0"
604604
dependencies = [
605605
"curl",
606606
"failure",
@@ -730,25 +730,24 @@ dependencies = [
730730

731731
[[package]]
732732
name = "curl"
733-
version = "0.4.21"
733+
version = "0.4.24"
734734
source = "registry+https://github.com/rust-lang/crates.io-index"
735-
checksum = "a85f2f95f2bd277d316d1aa8a477687ab4a6942258c7db7c89c187534669979c"
735+
checksum = "d08ad3cb89d076a36b0ce5749eec2c9964f70c0c58480ab6b75a91ec4fc206d8"
736736
dependencies = [
737737
"curl-sys",
738-
"kernel32-sys",
739738
"libc",
740739
"openssl-probe",
741740
"openssl-sys",
742741
"schannel",
743742
"socket2",
744-
"winapi 0.2.8",
743+
"winapi 0.3.6",
745744
]
746745

747746
[[package]]
748747
name = "curl-sys"
749-
version = "0.4.18"
748+
version = "0.4.22"
750749
source = "registry+https://github.com/rust-lang/crates.io-index"
751-
checksum = "9d91a0052d5b982887d8e829bee0faffc7218ea3c6ebd3d6c2c8f678a93c9a42"
750+
checksum = "2e9a9a4e417722876332136a00cacf92c2ceb331fab4b52b6a1ad16c6cd79255"
752751
dependencies = [
753752
"cc",
754753
"libc",

src/tools/cargo

Submodule cargo updated 84 files

src/tools/rls

Submodule rls updated from 80a1d34 to 8dc9ba9

src/tools/rustc-workspace-hack/Cargo.toml

+1
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ features = [
2424
"jobapi",
2525
"jobapi2",
2626
"knownfolders",
27+
"libloaderapi",
2728
"lmcons",
2829
"memoryapi",
2930
"minschannel",

0 commit comments

Comments
 (0)