Skip to content

Commit 42afb70

Browse files
authored
Rollup merge of #104750 - mati865:bump-fd-lock-again, r=jyn514
Bump `fd-lock` in `bootstrap` again Followup to #103778 Sorry for the quick succession but this fixes one more building issue for Tier 3 `windows-gnullvm` that I have previously missed, and it would be nice to have it in the release.
2 parents 316bda8 + cd22ce6 commit 42afb70

File tree

2 files changed

+22
-61
lines changed

2 files changed

+22
-61
lines changed

src/bootstrap/Cargo.lock

+21-60
Original file line numberDiff line numberDiff line change
@@ -225,13 +225,13 @@ dependencies = [
225225

226226
[[package]]
227227
name = "fd-lock"
228-
version = "3.0.7"
228+
version = "3.0.8"
229229
source = "registry+https://github.com/rust-lang/crates.io-index"
230-
checksum = "0c93a581058d957dc4176875aad04f82f81613e6611d64aa1a9c755bdfb16711"
230+
checksum = "bb21c69b9fea5e15dbc1049e4b77145dd0ba1c84019c488102de0dc4ea4b0a27"
231231
dependencies = [
232232
"cfg-if",
233233
"rustix",
234-
"windows-sys 0.42.0",
234+
"windows-sys",
235235
]
236236

237237
[[package]]
@@ -319,9 +319,13 @@ dependencies = [
319319

320320
[[package]]
321321
name = "io-lifetimes"
322-
version = "0.7.2"
322+
version = "1.0.1"
323323
source = "registry+https://github.com/rust-lang/crates.io-index"
324-
checksum = "24c3f4eff5495aee4c0399d7b6a0dc2b6e81be84242ffbfcf253ebacccc1d0cb"
324+
checksum = "a7d367024b3f3414d8e01f437f704f41a9f64ab36f9067fa73e526ad4c763c87"
325+
dependencies = [
326+
"libc",
327+
"windows-sys",
328+
]
325329

326330
[[package]]
327331
name = "itoa"
@@ -337,15 +341,15 @@ checksum = "e2abad23fbc42b3700f2f279844dc832adb2b2eb069b2df918f455c4e18cc646"
337341

338342
[[package]]
339343
name = "libc"
340-
version = "0.2.126"
344+
version = "0.2.137"
341345
source = "registry+https://github.com/rust-lang/crates.io-index"
342-
checksum = "349d5a591cd28b49e1d1037471617a32ddcda5731b99419008085f72d5a53836"
346+
checksum = "fc7fcc620a3bff7cdd7a365be3376c97191aeaccc2a603e600951e452615bf89"
343347

344348
[[package]]
345349
name = "linux-raw-sys"
346-
version = "0.0.46"
350+
version = "0.1.3"
347351
source = "registry+https://github.com/rust-lang/crates.io-index"
348-
checksum = "d4d2456c373231a208ad294c33dc5bff30051eafd954cd4caae83a712b12854d"
352+
checksum = "8f9f08d8963a6c613f4b1a78f4f4a4dbfadf8e6545b2d72861731e4858b8b47f"
349353

350354
[[package]]
351355
name = "log"
@@ -529,16 +533,16 @@ checksum = "49b3de9ec5dc0a3417da371aab17d729997c15010e7fd24ff707773a33bddb64"
529533

530534
[[package]]
531535
name = "rustix"
532-
version = "0.35.6"
536+
version = "0.36.3"
533537
source = "registry+https://github.com/rust-lang/crates.io-index"
534-
checksum = "ef258c11e17f5c01979a10543a30a4e12faef6aab217a74266e747eefa3aed88"
538+
checksum = "0b1fbb4dfc4eb1d390c02df47760bb19a84bb80b301ecc947ab5406394d8223e"
535539
dependencies = [
536540
"bitflags",
537541
"errno",
538542
"io-lifetimes",
539543
"libc",
540544
"linux-raw-sys",
541-
"windows-sys 0.36.1",
545+
"windows-sys",
542546
]
543547

544548
[[package]]
@@ -725,32 +729,19 @@ version = "0.4.0"
725729
source = "registry+https://github.com/rust-lang/crates.io-index"
726730
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
727731

728-
[[package]]
729-
name = "windows-sys"
730-
version = "0.36.1"
731-
source = "registry+https://github.com/rust-lang/crates.io-index"
732-
checksum = "ea04155a16a59f9eab786fe12a4a450e75cdb175f9e0d80da1e17db09f55b8d2"
733-
dependencies = [
734-
"windows_aarch64_msvc 0.36.1",
735-
"windows_i686_gnu 0.36.1",
736-
"windows_i686_msvc 0.36.1",
737-
"windows_x86_64_gnu 0.36.1",
738-
"windows_x86_64_msvc 0.36.1",
739-
]
740-
741732
[[package]]
742733
name = "windows-sys"
743734
version = "0.42.0"
744735
source = "registry+https://github.com/rust-lang/crates.io-index"
745736
checksum = "5a3e1820f08b8513f676f7ab6c1f99ff312fb97b553d30ff4dd86f9f15728aa7"
746737
dependencies = [
747738
"windows_aarch64_gnullvm",
748-
"windows_aarch64_msvc 0.42.0",
749-
"windows_i686_gnu 0.42.0",
750-
"windows_i686_msvc 0.42.0",
751-
"windows_x86_64_gnu 0.42.0",
739+
"windows_aarch64_msvc",
740+
"windows_i686_gnu",
741+
"windows_i686_msvc",
742+
"windows_x86_64_gnu",
752743
"windows_x86_64_gnullvm",
753-
"windows_x86_64_msvc 0.42.0",
744+
"windows_x86_64_msvc",
754745
]
755746

756747
[[package]]
@@ -759,48 +750,24 @@ version = "0.42.0"
759750
source = "registry+https://github.com/rust-lang/crates.io-index"
760751
checksum = "41d2aa71f6f0cbe00ae5167d90ef3cfe66527d6f613ca78ac8024c3ccab9a19e"
761752

762-
[[package]]
763-
name = "windows_aarch64_msvc"
764-
version = "0.36.1"
765-
source = "registry+https://github.com/rust-lang/crates.io-index"
766-
checksum = "9bb8c3fd39ade2d67e9874ac4f3db21f0d710bee00fe7cab16949ec184eeaa47"
767-
768753
[[package]]
769754
name = "windows_aarch64_msvc"
770755
version = "0.42.0"
771756
source = "registry+https://github.com/rust-lang/crates.io-index"
772757
checksum = "dd0f252f5a35cac83d6311b2e795981f5ee6e67eb1f9a7f64eb4500fbc4dcdb4"
773758

774-
[[package]]
775-
name = "windows_i686_gnu"
776-
version = "0.36.1"
777-
source = "registry+https://github.com/rust-lang/crates.io-index"
778-
checksum = "180e6ccf01daf4c426b846dfc66db1fc518f074baa793aa7d9b9aaeffad6a3b6"
779-
780759
[[package]]
781760
name = "windows_i686_gnu"
782761
version = "0.42.0"
783762
source = "registry+https://github.com/rust-lang/crates.io-index"
784763
checksum = "fbeae19f6716841636c28d695375df17562ca208b2b7d0dc47635a50ae6c5de7"
785764

786-
[[package]]
787-
name = "windows_i686_msvc"
788-
version = "0.36.1"
789-
source = "registry+https://github.com/rust-lang/crates.io-index"
790-
checksum = "e2e7917148b2812d1eeafaeb22a97e4813dfa60a3f8f78ebe204bcc88f12f024"
791-
792765
[[package]]
793766
name = "windows_i686_msvc"
794767
version = "0.42.0"
795768
source = "registry+https://github.com/rust-lang/crates.io-index"
796769
checksum = "84c12f65daa39dd2babe6e442988fc329d6243fdce47d7d2d155b8d874862246"
797770

798-
[[package]]
799-
name = "windows_x86_64_gnu"
800-
version = "0.36.1"
801-
source = "registry+https://github.com/rust-lang/crates.io-index"
802-
checksum = "4dcd171b8776c41b97521e5da127a2d86ad280114807d0b2ab1e462bc764d9e1"
803-
804771
[[package]]
805772
name = "windows_x86_64_gnu"
806773
version = "0.42.0"
@@ -813,12 +780,6 @@ version = "0.42.0"
813780
source = "registry+https://github.com/rust-lang/crates.io-index"
814781
checksum = "09d525d2ba30eeb3297665bd434a54297e4170c7f1a44cad4ef58095b4cd2028"
815782

816-
[[package]]
817-
name = "windows_x86_64_msvc"
818-
version = "0.36.1"
819-
source = "registry+https://github.com/rust-lang/crates.io-index"
820-
checksum = "c811ca4a8c853ef420abd8592ba53ddbbac90410fab6903b3e79972a631f7680"
821-
822783
[[package]]
823784
name = "windows_x86_64_msvc"
824785
version = "0.42.0"

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.7"
39+
fd-lock = "3.0.8"
4040
filetime = "0.2"
4141
getopts = "0.2.19"
4242
cc = "1.0.69"

0 commit comments

Comments
 (0)