Skip to content

Commit d5899ef

Browse files
mati865mati865
committed
Update several crates for improved support of the new targets
This helps with `*-windows-gnullvm` targets
1 parent 452cf4f commit d5899ef

File tree

4 files changed

+107
-36
lines changed

4 files changed

+107
-36
lines changed

‎Cargo.lock

+39-25
Original file line numberDiff line numberDiff line change
@@ -2522,7 +2522,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
25222522
checksum = "3742b2c103b9f06bc9fff0a37ff4912935851bee6d36f3c02bcc755bcfec228f"
25232523
dependencies = [
25242524
"lock_api",
2525-
"parking_lot_core 0.9.3",
2525+
"parking_lot_core 0.9.4",
25262526
]
25272527

25282528
[[package]]
@@ -2541,15 +2541,15 @@ dependencies = [
25412541

25422542
[[package]]
25432543
name = "parking_lot_core"
2544-
version = "0.9.3"
2544+
version = "0.9.4"
25452545
source = "registry+https://github.com/rust-lang/crates.io-index"
2546-
checksum = "09a279cbf25cb0757810394fbc1e359949b59e348145c643a939a525692e6929"
2546+
checksum = "4dc9e0dc2adc1c69d09143aff38d3d30c5c3f0df0dad82e6d25547af174ebec0"
25472547
dependencies = [
25482548
"cfg-if 1.0.0",
25492549
"libc",
25502550
"redox_syscall",
25512551
"smallvec",
2552-
"windows-sys 0.36.1",
2552+
"windows-sys 0.42.0",
25532553
]
25542554

25552555
[[package]]
@@ -2774,9 +2774,9 @@ dependencies = [
27742774

27752775
[[package]]
27762776
name = "psm"
2777-
version = "0.1.16"
2777+
version = "0.1.21"
27782778
source = "registry+https://github.com/rust-lang/crates.io-index"
2779-
checksum = "cd136ff4382c4753fc061cb9e4712ab2af263376b95bbd5bd8cd50c020b78e69"
2779+
checksum = "5787f7cda34e3033a72192c018bc5883100330f362ef279a8cbccfce8bb4e874"
27802780
dependencies = [
27812781
"cc",
27822782
]
@@ -4677,9 +4677,9 @@ checksum = "a8f112729512f8e442d81f95a8a7ddf2b7c6b8a1a6f509a95864142b30cab2d3"
46774677

46784678
[[package]]
46794679
name = "stacker"
4680-
version = "0.1.14"
4680+
version = "0.1.15"
46814681
source = "registry+https://github.com/rust-lang/crates.io-index"
4682-
checksum = "90939d5171a4420b3ff5fbc8954d641e7377335454c259dcb80786f3f21dc9b4"
4682+
checksum = "c886bd4480155fd3ef527d45e9ac8dd7118a898a46530b7b94c3e21866259fce"
46834683
dependencies = [
46844684
"cc",
46854685
"cfg-if 1.0.0",
@@ -5499,17 +5499,25 @@ dependencies = [
54995499

55005500
[[package]]
55015501
name = "windows-sys"
5502-
version = "0.36.1"
5502+
version = "0.42.0"
55035503
source = "registry+https://github.com/rust-lang/crates.io-index"
5504-
checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
5504+
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
55055505
dependencies = [
5506-
"windows_aarch64_msvc 0.36.1",
5507-
"windows_i686_gnu 0.36.1",
5508-
"windows_i686_msvc 0.36.1",
5509-
"windows_x86_64_gnu 0.36.1",
5510-
"windows_x86_64_msvc 0.36.1",
5506+
"windows_aarch64_gnullvm",
5507+
"windows_aarch64_msvc 0.42.0",
5508+
"windows_i686_gnu 0.42.0",
5509+
"windows_i686_msvc 0.42.0",
5510+
"windows_x86_64_gnu 0.42.0",
5511+
"windows_x86_64_gnullvm",
5512+
"windows_x86_64_msvc 0.42.0",
55115513
]
55125514

5515+
[[package]]
5516+
name = "windows_aarch64_gnullvm"
5517+
version = "0.42.0"
5518+
source = "registry+https://github.com/rust-lang/crates.io-index"
5519+
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
5520+
55135521
[[package]]
55145522
name = "windows_aarch64_msvc"
55155523
version = "0.28.0"
@@ -5518,9 +5526,9 @@ checksum = "52695a41e536859d5308cc613b4a022261a274390b25bd29dfff4bf08505f3c2"
55185526

55195527
[[package]]
55205528
name = "windows_aarch64_msvc"
5521-
version = "0.36.1"
5529+
version = "0.42.0"
55225530
source = "registry+https://github.com/rust-lang/crates.io-index"
5523-
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
5531+
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
55245532

55255533
[[package]]
55265534
name = "windows_i686_gnu"
@@ -5530,9 +5538,9 @@ checksum = "f54725ac23affef038fecb177de6c9bf065787c2f432f79e3c373da92f3e1d8a"
55305538

55315539
[[package]]
55325540
name = "windows_i686_gnu"
5533-
version = "0.36.1"
5541+
version = "0.42.0"
55345542
source = "registry+https://github.com/rust-lang/crates.io-index"
5535-
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
5543+
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
55365544

55375545
[[package]]
55385546
name = "windows_i686_msvc"
@@ -5542,9 +5550,9 @@ checksum = "51d5158a43cc43623c0729d1ad6647e62fa384a3d135fd15108d37c683461f64"
55425550

55435551
[[package]]
55445552
name = "windows_i686_msvc"
5545-
version = "0.36.1"
5553+
version = "0.42.0"
55465554
source = "registry+https://github.com/rust-lang/crates.io-index"
5547-
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
5555+
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
55485556

55495557
[[package]]
55505558
name = "windows_x86_64_gnu"
@@ -5554,9 +5562,15 @@ checksum = "bc31f409f565611535130cfe7ee8e6655d3fa99c1c61013981e491921b5ce954"
55545562

55555563
[[package]]
55565564
name = "windows_x86_64_gnu"
5557-
version = "0.36.1"
5565+
version = "0.42.0"
5566+
source = "registry+https://github.com/rust-lang/crates.io-index"
5567+
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
5568+
5569+
[[package]]
5570+
name = "windows_x86_64_gnullvm"
5571+
version = "0.42.0"
55585572
source = "registry+https://github.com/rust-lang/crates.io-index"
5559-
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
5573+
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
55605574

55615575
[[package]]
55625576
name = "windows_x86_64_msvc"
@@ -5566,9 +5580,9 @@ checksum = "3f2b8c7cbd3bfdddd9ab98769f9746a7fad1bca236554cd032b78d768bc0e89f"
55665580

55675581
[[package]]
55685582
name = "windows_x86_64_msvc"
5569-
version = "0.36.1"
5583+
version = "0.42.0"
55705584
source = "registry+https://github.com/rust-lang/crates.io-index"
5571-
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
5585+
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
55725586

55735587
[[package]]
55745588
name = "xattr"

‎compiler/rustc_data_structures/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ rustc_macros = { path = "../rustc_macros" }
2323
rustc_serialize = { path = "../rustc_serialize" }
2424
smallvec = { version = "1.8.1", features = ["const_generics", "union", "may_dangle"] }
2525
stable_deref_trait = "1.0.0"
26-
stacker = "0.1.14"
26+
stacker = "0.1.15"
2727
tempfile = "3.2"
2828
thin-vec = "0.2.9"
2929
tracing = "0.1"

‎src/bootstrap/Cargo.lock

+66-9
Original file line numberDiff line numberDiff line change
@@ -224,13 +224,13 @@ dependencies = [
224224

225225
[[package]]
226226
name = "fd-lock"
227-
version = "3.0.6"
227+
version = "3.0.7"
228228
source = "registry+https://github.com/rust-lang/crates.io-index"
229-
checksum = "e11dcc7e4d79a8c89b9ab4c6f5c30b1fc4a83c420792da3542fd31179ed5f517"
229+
checksum = "0c93a581058d957dc4176875aad04f82f81613e6611d64aa1a9c755bdfb16711"
230230
dependencies = [
231231
"cfg-if",
232232
"rustix",
233-
"windows-sys",
233+
"windows-sys 0.42.0",
234234
]
235235

236236
[[package]]
@@ -528,7 +528,7 @@ dependencies = [
528528
"io-lifetimes",
529529
"libc",
530530
"linux-raw-sys",
531-
"windows-sys",
531+
"windows-sys 0.36.1",
532532
]
533533

534534
[[package]]
@@ -721,43 +721,100 @@ version = "0.36.1"
721721
source = "registry+https://github.com/rust-lang/crates.io-index"
722722
checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
723723
dependencies = [
724-
"windows_aarch64_msvc",
725-
"windows_i686_gnu",
726-
"windows_i686_msvc",
727-
"windows_x86_64_gnu",
728-
"windows_x86_64_msvc",
724+
"windows_aarch64_msvc 0.36.1",
725+
"windows_i686_gnu 0.36.1",
726+
"windows_i686_msvc 0.36.1",
727+
"windows_x86_64_gnu 0.36.1",
728+
"windows_x86_64_msvc 0.36.1",
729729
]
730730

731+
[[package]]
732+
name = "windows-sys"
733+
version = "0.42.0"
734+
source = "registry+https://github.com/rust-lang/crates.io-index"
735+
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
736+
dependencies = [
737+
"windows_aarch64_gnullvm",
738+
"windows_aarch64_msvc 0.42.0",
739+
"windows_i686_gnu 0.42.0",
740+
"windows_i686_msvc 0.42.0",
741+
"windows_x86_64_gnu 0.42.0",
742+
"windows_x86_64_gnullvm",
743+
"windows_x86_64_msvc 0.42.0",
744+
]
745+
746+
[[package]]
747+
name = "windows_aarch64_gnullvm"
748+
version = "0.42.0"
749+
source = "registry+https://github.com/rust-lang/crates.io-index"
750+
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
751+
731752
[[package]]
732753
name = "windows_aarch64_msvc"
733754
version = "0.36.1"
734755
source = "registry+https://github.com/rust-lang/crates.io-index"
735756
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
736757

758+
[[package]]
759+
name = "windows_aarch64_msvc"
760+
version = "0.42.0"
761+
source = "registry+https://github.com/rust-lang/crates.io-index"
762+
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
763+
737764
[[package]]
738765
name = "windows_i686_gnu"
739766
version = "0.36.1"
740767
source = "registry+https://github.com/rust-lang/crates.io-index"
741768
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
742769

770+
[[package]]
771+
name = "windows_i686_gnu"
772+
version = "0.42.0"
773+
source = "registry+https://github.com/rust-lang/crates.io-index"
774+
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
775+
743776
[[package]]
744777
name = "windows_i686_msvc"
745778
version = "0.36.1"
746779
source = "registry+https://github.com/rust-lang/crates.io-index"
747780
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
748781

782+
[[package]]
783+
name = "windows_i686_msvc"
784+
version = "0.42.0"
785+
source = "registry+https://github.com/rust-lang/crates.io-index"
786+
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
787+
749788
[[package]]
750789
name = "windows_x86_64_gnu"
751790
version = "0.36.1"
752791
source = "registry+https://github.com/rust-lang/crates.io-index"
753792
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
754793

794+
[[package]]
795+
name = "windows_x86_64_gnu"
796+
version = "0.42.0"
797+
source = "registry+https://github.com/rust-lang/crates.io-index"
798+
checksum = "bf7b1b21b5362cbc318f686150e5bcea75ecedc74dd157d874d754a2ca44b0ed"
799+
800+
[[package]]
801+
name = "windows_x86_64_gnullvm"
802+
version = "0.42.0"
803+
source = "registry+https://github.com/rust-lang/crates.io-index"
804+
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
805+
755806
[[package]]
756807
name = "windows_x86_64_msvc"
757808
version = "0.36.1"
758809
source = "registry+https://github.com/rust-lang/crates.io-index"
759810
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
760811

812+
[[package]]
813+
name = "windows_x86_64_msvc"
814+
version = "0.42.0"
815+
source = "registry+https://github.com/rust-lang/crates.io-index"
816+
checksum = "f40009d85759725a34da6d89a94e63d7bdc50a862acf0dbc7c8e488f1edcb6f5"
817+
761818
[[package]]
762819
name = "xattr"
763820
version = "0.2.3"

‎src/bootstrap/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ test = false
3636

3737
[dependencies]
3838
cmake = "0.1.38"
39-
fd-lock = "3.0.6"
39+
fd-lock = "3.0.7"
4040
filetime = "0.2"
4141
getopts = "0.2.19"
4242
cc = "1.0.69"

0 commit comments

Comments
 (0)