Skip to content

Commit fbaf7ff

Browse files
authored
Rollup merge of #146168 - dpaoliello:bootstrapdeps, r=jieyouxu
Update bootstrap's dependencies to remove winapi and old windows-sys Bumps `opener` to 0.8 and `junction` to 1.3 - this removes the dependency on `winapi` (unless the `build-metrics` feature is enabled) and replaces the usage of `windows-sys` 0.52 with 0.60. Together this means that bootstrap can now be built for Arm64EC.
2 parents be1d829 + 31d1d82 commit fbaf7ff

File tree

2 files changed

+108
-34
lines changed

2 files changed

+108
-34
lines changed

src/bootstrap/Cargo.lock

Lines changed: 106 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -269,14 +269,14 @@ checksum = "37909eebbb50d72f9059c3b6d82c0463f2ff062c9e95845c43a6c9c0355411be"
269269

270270
[[package]]
271271
name = "filetime"
272-
version = "0.2.25"
272+
version = "0.2.26"
273273
source = "registry+https://github.com/rust-lang/crates.io-index"
274-
checksum = "35c0522e981e68cbfa8c3f978441a5f34b30b96e146b33cd3359176b50fe8586"
274+
checksum = "bc0505cd1b6fa6580283f6bdf70a73fcf4aba1184038c90902b92b3dd0df63ed"
275275
dependencies = [
276276
"cfg-if",
277277
"libc",
278278
"libredox",
279-
"windows-sys 0.59.0",
279+
"windows-sys 0.60.2",
280280
]
281281

282282
[[package]]
@@ -322,11 +322,11 @@ checksum = "2304e00983f87ffb38b55b444b5e3b60a884b5d30c0fca7d82fe33449bbe55ea"
322322

323323
[[package]]
324324
name = "home"
325-
version = "0.5.9"
325+
version = "0.5.11"
326326
source = "registry+https://github.com/rust-lang/crates.io-index"
327-
checksum = "e3d1354bf6b7235cb4a0576c2619fd4ed18183f689b12b006a0ee7329eeff9a5"
327+
checksum = "589533453244b0995c858700322199b2becb13b627df2851f64a2775d024abcf"
328328
dependencies = [
329-
"windows-sys 0.52.0",
329+
"windows-sys 0.59.0",
330330
]
331331

332332
[[package]]
@@ -364,12 +364,12 @@ checksum = "49f1f14873335454500d59611f1cf4a4b0f786f9ac11f4312a78e4cf2566695b"
364364

365365
[[package]]
366366
name = "junction"
367-
version = "1.2.0"
367+
version = "1.3.0"
368368
source = "registry+https://github.com/rust-lang/crates.io-index"
369-
checksum = "72bbdfd737a243da3dfc1f99ee8d6e166480f17ab4ac84d7c34aacd73fc7bd16"
369+
checksum = "c52f6e1bf39a7894f618c9d378904a11dbd7e10fe3ec20d1173600e79b1408d8"
370370
dependencies = [
371371
"scopeguard",
372-
"windows-sys 0.52.0",
372+
"windows-sys 0.60.2",
373373
]
374374

375375
[[package]]
@@ -433,6 +433,15 @@ version = "2.7.4"
433433
source = "registry+https://github.com/rust-lang/crates.io-index"
434434
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
435435

436+
[[package]]
437+
name = "normpath"
438+
version = "1.3.0"
439+
source = "registry+https://github.com/rust-lang/crates.io-index"
440+
checksum = "c8911957c4b1549ac0dc74e30db9c8b0e66ddcd6d7acc33098f4c63a64a6d7ed"
441+
dependencies = [
442+
"windows-sys 0.59.0",
443+
]
444+
436445
[[package]]
437446
name = "ntapi"
438447
version = "0.4.1"
@@ -497,12 +506,13 @@ checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775"
497506

498507
[[package]]
499508
name = "opener"
500-
version = "0.5.2"
509+
version = "0.8.2"
501510
source = "registry+https://github.com/rust-lang/crates.io-index"
502-
checksum = "293c15678e37254c15bd2f092314abb4e51d7fdde05c2021279c12631b54f005"
511+
checksum = "771b9704f8cd8b424ec747a320b30b47517a6966ba2c7da90047c16f4a962223"
503512
dependencies = [
504513
"bstr",
505-
"winapi",
514+
"normpath",
515+
"windows-sys 0.59.0",
506516
]
507517

508518
[[package]]
@@ -757,15 +767,15 @@ dependencies = [
757767

758768
[[package]]
759769
name = "tempfile"
760-
version = "3.19.0"
770+
version = "3.21.0"
761771
source = "registry+https://github.com/rust-lang/crates.io-index"
762-
checksum = "488960f40a3fd53d72c2a29a58722561dee8afdd175bd88e3db4677d7b2ba600"
772+
checksum = "15b61f8f20e3a6f7e0649d825294eaf317edce30f82cf6026e7e4cb9222a7d1e"
763773
dependencies = [
764774
"fastrand",
765775
"getrandom",
766776
"once_cell",
767777
"rustix",
768-
"windows-sys 0.59.0",
778+
"windows-sys 0.60.2",
769779
]
770780

771781
[[package]]
@@ -929,11 +939,11 @@ checksum = "ac3b87c63620426dd9b991e5ce0329eff545bccbbb34f3be09ff6fb6ab51b7b6"
929939

930940
[[package]]
931941
name = "winapi-util"
932-
version = "0.1.9"
942+
version = "0.1.10"
933943
source = "registry+https://github.com/rust-lang/crates.io-index"
934-
checksum = "cf221c93e13a30d793f7645a0e7762c55d169dbb0a49671918a2319d289b10bb"
944+
checksum = "0978bf7171b3d90bac376700cb56d606feb40f251a475a5d6634613564460b22"
935945
dependencies = [
936-
"windows-sys 0.59.0",
946+
"windows-sys 0.60.2",
937947
]
938948

939949
[[package]]
@@ -1045,20 +1055,20 @@ dependencies = [
10451055

10461056
[[package]]
10471057
name = "windows-sys"
1048-
version = "0.52.0"
1058+
version = "0.59.0"
10491059
source = "registry+https://github.com/rust-lang/crates.io-index"
1050-
checksum = "282be5f36a8ce781fad8c8ae18fa3f9beff57ec1b52cb3de0789201425d9a33d"
1060+
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
10511061
dependencies = [
1052-
"windows-targets",
1062+
"windows-targets 0.52.6",
10531063
]
10541064

10551065
[[package]]
10561066
name = "windows-sys"
1057-
version = "0.59.0"
1067+
version = "0.60.2"
10581068
source = "registry+https://github.com/rust-lang/crates.io-index"
1059-
checksum = "1e38bc4d79ed67fd075bcc251a1c39b32a1776bbe92e5bef1f0bf1f8c531853b"
1069+
checksum = "f2f500e4d28234f72040990ec9d39e3a6b950f9f22d3dba18416c35882612bcb"
10601070
dependencies = [
1061-
"windows-targets",
1071+
"windows-targets 0.53.2",
10621072
]
10631073

10641074
[[package]]
@@ -1067,14 +1077,30 @@ version = "0.52.6"
10671077
source = "registry+https://github.com/rust-lang/crates.io-index"
10681078
checksum = "9b724f72796e036ab90c1021d4780d4d3d648aca59e491e6b98e725b84e99973"
10691079
dependencies = [
1070-
"windows_aarch64_gnullvm",
1071-
"windows_aarch64_msvc",
1072-
"windows_i686_gnu",
1073-
"windows_i686_gnullvm",
1074-
"windows_i686_msvc",
1075-
"windows_x86_64_gnu",
1076-
"windows_x86_64_gnullvm",
1077-
"windows_x86_64_msvc",
1080+
"windows_aarch64_gnullvm 0.52.6",
1081+
"windows_aarch64_msvc 0.52.6",
1082+
"windows_i686_gnu 0.52.6",
1083+
"windows_i686_gnullvm 0.52.6",
1084+
"windows_i686_msvc 0.52.6",
1085+
"windows_x86_64_gnu 0.52.6",
1086+
"windows_x86_64_gnullvm 0.52.6",
1087+
"windows_x86_64_msvc 0.52.6",
1088+
]
1089+
1090+
[[package]]
1091+
name = "windows-targets"
1092+
version = "0.53.2"
1093+
source = "registry+https://github.com/rust-lang/crates.io-index"
1094+
checksum = "c66f69fcc9ce11da9966ddb31a40968cad001c5bedeb5c2b82ede4253ab48aef"
1095+
dependencies = [
1096+
"windows_aarch64_gnullvm 0.53.0",
1097+
"windows_aarch64_msvc 0.53.0",
1098+
"windows_i686_gnu 0.53.0",
1099+
"windows_i686_gnullvm 0.53.0",
1100+
"windows_i686_msvc 0.53.0",
1101+
"windows_x86_64_gnu 0.53.0",
1102+
"windows_x86_64_gnullvm 0.53.0",
1103+
"windows_x86_64_msvc 0.53.0",
10781104
]
10791105

10801106
[[package]]
@@ -1083,48 +1109,96 @@ version = "0.52.6"
10831109
source = "registry+https://github.com/rust-lang/crates.io-index"
10841110
checksum = "32a4622180e7a0ec044bb555404c800bc9fd9ec262ec147edd5989ccd0c02cd3"
10851111

1112+
[[package]]
1113+
name = "windows_aarch64_gnullvm"
1114+
version = "0.53.0"
1115+
source = "registry+https://github.com/rust-lang/crates.io-index"
1116+
checksum = "86b8d5f90ddd19cb4a147a5fa63ca848db3df085e25fee3cc10b39b6eebae764"
1117+
10861118
[[package]]
10871119
name = "windows_aarch64_msvc"
10881120
version = "0.52.6"
10891121
source = "registry+https://github.com/rust-lang/crates.io-index"
10901122
checksum = "09ec2a7bb152e2252b53fa7803150007879548bc709c039df7627cabbd05d469"
10911123

1124+
[[package]]
1125+
name = "windows_aarch64_msvc"
1126+
version = "0.53.0"
1127+
source = "registry+https://github.com/rust-lang/crates.io-index"
1128+
checksum = "c7651a1f62a11b8cbd5e0d42526e55f2c99886c77e007179efff86c2b137e66c"
1129+
10921130
[[package]]
10931131
name = "windows_i686_gnu"
10941132
version = "0.52.6"
10951133
source = "registry+https://github.com/rust-lang/crates.io-index"
10961134
checksum = "8e9b5ad5ab802e97eb8e295ac6720e509ee4c243f69d781394014ebfe8bbfa0b"
10971135

1136+
[[package]]
1137+
name = "windows_i686_gnu"
1138+
version = "0.53.0"
1139+
source = "registry+https://github.com/rust-lang/crates.io-index"
1140+
checksum = "c1dc67659d35f387f5f6c479dc4e28f1d4bb90ddd1a5d3da2e5d97b42d6272c3"
1141+
10981142
[[package]]
10991143
name = "windows_i686_gnullvm"
11001144
version = "0.52.6"
11011145
source = "registry+https://github.com/rust-lang/crates.io-index"
11021146
checksum = "0eee52d38c090b3caa76c563b86c3a4bd71ef1a819287c19d586d7334ae8ed66"
11031147

1148+
[[package]]
1149+
name = "windows_i686_gnullvm"
1150+
version = "0.53.0"
1151+
source = "registry+https://github.com/rust-lang/crates.io-index"
1152+
checksum = "9ce6ccbdedbf6d6354471319e781c0dfef054c81fbc7cf83f338a4296c0cae11"
1153+
11041154
[[package]]
11051155
name = "windows_i686_msvc"
11061156
version = "0.52.6"
11071157
source = "registry+https://github.com/rust-lang/crates.io-index"
11081158
checksum = "240948bc05c5e7c6dabba28bf89d89ffce3e303022809e73deaefe4f6ec56c66"
11091159

1160+
[[package]]
1161+
name = "windows_i686_msvc"
1162+
version = "0.53.0"
1163+
source = "registry+https://github.com/rust-lang/crates.io-index"
1164+
checksum = "581fee95406bb13382d2f65cd4a908ca7b1e4c2f1917f143ba16efe98a589b5d"
1165+
11101166
[[package]]
11111167
name = "windows_x86_64_gnu"
11121168
version = "0.52.6"
11131169
source = "registry+https://github.com/rust-lang/crates.io-index"
11141170
checksum = "147a5c80aabfbf0c7d901cb5895d1de30ef2907eb21fbbab29ca94c5b08b1a78"
11151171

1172+
[[package]]
1173+
name = "windows_x86_64_gnu"
1174+
version = "0.53.0"
1175+
source = "registry+https://github.com/rust-lang/crates.io-index"
1176+
checksum = "2e55b5ac9ea33f2fc1716d1742db15574fd6fc8dadc51caab1c16a3d3b4190ba"
1177+
11161178
[[package]]
11171179
name = "windows_x86_64_gnullvm"
11181180
version = "0.52.6"
11191181
source = "registry+https://github.com/rust-lang/crates.io-index"
11201182
checksum = "24d5b23dc417412679681396f2b49f3de8c1473deb516bd34410872eff51ed0d"
11211183

1184+
[[package]]
1185+
name = "windows_x86_64_gnullvm"
1186+
version = "0.53.0"
1187+
source = "registry+https://github.com/rust-lang/crates.io-index"
1188+
checksum = "0a6e035dd0599267ce1ee132e51c27dd29437f63325753051e71dd9e42406c57"
1189+
11221190
[[package]]
11231191
name = "windows_x86_64_msvc"
11241192
version = "0.52.6"
11251193
source = "registry+https://github.com/rust-lang/crates.io-index"
11261194
checksum = "589f6da84c646204747d1270a2a5661ea66ed1cced2631d546fdfb155959f9ec"
11271195

1196+
[[package]]
1197+
name = "windows_x86_64_msvc"
1198+
version = "0.53.0"
1199+
source = "registry+https://github.com/rust-lang/crates.io-index"
1200+
checksum = "271414315aff87387382ec3d271b52d7ae78726f5d44ac98b4f4030c91880486"
1201+
11281202
[[package]]
11291203
name = "wit-bindgen-rt"
11301204
version = "0.39.0"

src/bootstrap/Cargo.toml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ home = "0.5"
4242
ignore = "0.4"
4343
libc = "0.2"
4444
object = { version = "0.36.3", default-features = false, features = ["archive", "coff", "read_core", "std", "unaligned"] }
45-
opener = "0.5"
45+
opener = "0.8"
4646
semver = "1.0"
4747
serde = "1.0"
4848
# Directly use serde_derive rather than through the derive feature of serde to allow building both
@@ -67,7 +67,7 @@ tracing-subscriber = { version = "0.3", optional = true, features = ["env-filter
6767
tempfile = { version = "3.15.0", optional = true }
6868

6969
[target.'cfg(windows)'.dependencies.junction]
70-
version = "1.0.0"
70+
version = "1.3.0"
7171

7272
[target.'cfg(windows)'.dependencies.windows]
7373
version = "0.61"

0 commit comments

Comments
 (0)