Skip to content

Commit 4c5ddec

Browse files
fmeasefmease
authored
Rollup merge of rust-lang#141127 - klensy:windows-bump-61, r=albertlarsan68,jieyouxu
bump windows crate for compiler,bootstrap and tools This dedupes crate versions. For `x86_64-pc-windows-msvc` stage1 cuts few kb from `rustc_driver.dll`, nice.
2 parents 519178e + 40940e1 commit 4c5ddec

File tree

12 files changed

+34
-128
lines changed

12 files changed

+34
-128
lines changed

‎Cargo.lock

Lines changed: 14 additions & 57 deletions
Original file line numberDiff line numberDiff line change
@@ -738,7 +738,7 @@ dependencies = [
738738
"tracing-subscriber",
739739
"unified-diff",
740740
"walkdir",
741-
"windows 0.59.0",
741+
"windows",
742742
]
743743

744744
[[package]]
@@ -1587,7 +1587,7 @@ dependencies = [
15871587
"js-sys",
15881588
"log",
15891589
"wasm-bindgen",
1590-
"windows-core 0.61.0",
1590+
"windows-core",
15911591
]
15921592

15931593
[[package]]
@@ -3493,7 +3493,7 @@ dependencies = [
34933493
"thorin-dwp",
34943494
"tracing",
34953495
"wasm-encoder 0.219.2",
3496-
"windows 0.59.0",
3496+
"windows",
34973497
]
34983498

34993499
[[package]]
@@ -3552,7 +3552,7 @@ dependencies = [
35523552
"tempfile",
35533553
"thin-vec",
35543554
"tracing",
3555-
"windows 0.59.0",
3555+
"windows",
35563556
]
35573557

35583558
[[package]]
@@ -3615,7 +3615,7 @@ dependencies = [
36153615
"shlex",
36163616
"stable_mir",
36173617
"tracing",
3618-
"windows 0.59.0",
3618+
"windows",
36193619
]
36203620

36213621
[[package]]
@@ -3670,7 +3670,7 @@ dependencies = [
36703670
"termcolor",
36713671
"termize",
36723672
"tracing",
3673-
"windows 0.59.0",
3673+
"windows",
36743674
]
36753675

36763676
[[package]]
@@ -4415,7 +4415,7 @@ dependencies = [
44154415
"smallvec",
44164416
"termize",
44174417
"tracing",
4418-
"windows 0.59.0",
4418+
"windows",
44194419
]
44204420

44214421
[[package]]
@@ -5102,7 +5102,7 @@ dependencies = [
51025102
"libc",
51035103
"objc2-core-foundation",
51045104
"objc2-io-kit",
5105-
"windows 0.61.1",
5105+
"windows",
51065106
]
51075107

51085108
[[package]]
@@ -6002,24 +6002,14 @@ version = "0.4.0"
60026002
source = "registry+https://github.com/rust-lang/crates.io-index"
60036003
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
60046004

6005-
[[package]]
6006-
name = "windows"
6007-
version = "0.59.0"
6008-
source = "registry+https://github.com/rust-lang/crates.io-index"
6009-
checksum = "7f919aee0a93304be7f62e8e5027811bbba96bcb1de84d6618be56e43f8a32a1"
6010-
dependencies = [
6011-
"windows-core 0.59.0",
6012-
"windows-targets 0.53.0",
6013-
]
6014-
60156005
[[package]]
60166006
name = "windows"
60176007
version = "0.61.1"
60186008
source = "registry+https://github.com/rust-lang/crates.io-index"
60196009
checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
60206010
dependencies = [
60216011
"windows-collections",
6022-
"windows-core 0.61.0",
6012+
"windows-core",
60236013
"windows-future",
60246014
"windows-link",
60256015
"windows-numerics",
@@ -6042,20 +6032,7 @@ version = "0.2.0"
60426032
source = "registry+https://github.com/rust-lang/crates.io-index"
60436033
checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
60446034
dependencies = [
6045-
"windows-core 0.61.0",
6046-
]
6047-
6048-
[[package]]
6049-
name = "windows-core"
6050-
version = "0.59.0"
6051-
source = "registry+https://github.com/rust-lang/crates.io-index"
6052-
checksum = "810ce18ed2112484b0d4e15d022e5f598113e220c53e373fb31e67e21670c1ce"
6053-
dependencies = [
6054-
"windows-implement 0.59.0",
6055-
"windows-interface",
6056-
"windows-result",
6057-
"windows-strings 0.3.1",
6058-
"windows-targets 0.53.0",
6035+
"windows-core",
60596036
]
60606037

60616038
[[package]]
@@ -6064,11 +6041,11 @@ version = "0.61.0"
60646041
source = "registry+https://github.com/rust-lang/crates.io-index"
60656042
checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
60666043
dependencies = [
6067-
"windows-implement 0.60.0",
6044+
"windows-implement",
60686045
"windows-interface",
60696046
"windows-link",
60706047
"windows-result",
6071-
"windows-strings 0.4.0",
6048+
"windows-strings",
60726049
]
60736050

60746051
[[package]]
@@ -6077,21 +6054,10 @@ version = "0.2.0"
60776054
source = "registry+https://github.com/rust-lang/crates.io-index"
60786055
checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
60796056
dependencies = [
6080-
"windows-core 0.61.0",
6057+
"windows-core",
60816058
"windows-link",
60826059
]
60836060

6084-
[[package]]
6085-
name = "windows-implement"
6086-
version = "0.59.0"
6087-
source = "registry+https://github.com/rust-lang/crates.io-index"
6088-
checksum = "83577b051e2f49a058c308f17f273b570a6a758386fc291b5f6a934dd84e48c1"
6089-
dependencies = [
6090-
"proc-macro2",
6091-
"quote",
6092-
"syn 2.0.101",
6093-
]
6094-
60956061
[[package]]
60966062
name = "windows-implement"
60976063
version = "0.60.0"
@@ -6126,7 +6092,7 @@ version = "0.2.0"
61266092
source = "registry+https://github.com/rust-lang/crates.io-index"
61276093
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
61286094
dependencies = [
6129-
"windows-core 0.61.0",
6095+
"windows-core",
61306096
"windows-link",
61316097
]
61326098

@@ -6139,15 +6105,6 @@ dependencies = [
61396105
"windows-link",
61406106
]
61416107

6142-
[[package]]
6143-
name = "windows-strings"
6144-
version = "0.3.1"
6145-
source = "registry+https://github.com/rust-lang/crates.io-index"
6146-
checksum = "87fa48cc5d406560701792be122a10132491cff9d0aeb23583cc2dcafc847319"
6147-
dependencies = [
6148-
"windows-link",
6149-
]
6150-
61516108
[[package]]
61526109
name = "windows-strings"
61536110
version = "0.4.0"

‎compiler/rustc_codegen_ssa/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,5 @@ default-features = false
5858
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
5959

6060
[target.'cfg(windows)'.dependencies.windows]
61-
version = "0.59.0"
61+
version = "0.61.0"
6262
features = ["Win32_Globalization"]

‎compiler/rustc_data_structures/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -38,7 +38,7 @@ features = ["nightly"] # for may_dangle
3838
version = "0.12"
3939

4040
[target.'cfg(windows)'.dependencies.windows]
41-
version = "0.59.0"
41+
version = "0.61.0"
4242
features = [
4343
"Win32_Foundation",
4444
"Win32_Storage_FileSystem",

‎compiler/rustc_driver_impl/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,7 @@ libc = "0.2"
6060
# tidy-alphabetical-end
6161

6262
[target.'cfg(windows)'.dependencies.windows]
63-
version = "0.59.0"
63+
version = "0.61.0"
6464
features = [
6565
"Win32_System_Diagnostics_Debug",
6666
]

‎compiler/rustc_errors/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ tracing = "0.1"
3333
# tidy-alphabetical-end
3434

3535
[target.'cfg(windows)'.dependencies.windows]
36-
version = "0.59.0"
36+
version = "0.61.0"
3737
features = [
3838
"Win32_Foundation",
3939
"Win32_Security",

‎compiler/rustc_session/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ libc = "0.2"
3333
# tidy-alphabetical-end
3434

3535
[target.'cfg(windows)'.dependencies.windows]
36-
version = "0.59.0"
36+
version = "0.61.0"
3737
features = [
3838
"Win32_Foundation",
3939
"Win32_System_LibraryLoader",

‎src/bootstrap/Cargo.lock

Lines changed: 9 additions & 62 deletions
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ dependencies = [
6464
"tracing-subscriber",
6565
"tracing-tree",
6666
"walkdir",
67-
"windows 0.57.0",
67+
"windows",
6868
"xz2",
6969
]
7070

@@ -703,7 +703,7 @@ dependencies = [
703703
"ntapi",
704704
"objc2-core-foundation",
705705
"objc2-io-kit",
706-
"windows 0.61.1",
706+
"windows",
707707
]
708708

709709
[[package]]
@@ -916,24 +916,14 @@ version = "0.4.0"
916916
source = "registry+https://github.com/rust-lang/crates.io-index"
917917
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
918918

919-
[[package]]
920-
name = "windows"
921-
version = "0.57.0"
922-
source = "registry+https://github.com/rust-lang/crates.io-index"
923-
checksum = "12342cb4d8e3b046f3d80effd474a7a02447231330ef77d71daa6fbc40681143"
924-
dependencies = [
925-
"windows-core 0.57.0",
926-
"windows-targets",
927-
]
928-
929919
[[package]]
930920
name = "windows"
931921
version = "0.61.1"
932922
source = "registry+https://github.com/rust-lang/crates.io-index"
933923
checksum = "c5ee8f3d025738cb02bad7868bbb5f8a6327501e870bf51f1b455b0a2454a419"
934924
dependencies = [
935925
"windows-collections",
936-
"windows-core 0.61.0",
926+
"windows-core",
937927
"windows-future",
938928
"windows-link",
939929
"windows-numerics",
@@ -945,19 +935,7 @@ version = "0.2.0"
945935
source = "registry+https://github.com/rust-lang/crates.io-index"
946936
checksum = "3beeceb5e5cfd9eb1d76b381630e82c4241ccd0d27f1a39ed41b2760b255c5e8"
947937
dependencies = [
948-
"windows-core 0.61.0",
949-
]
950-
951-
[[package]]
952-
name = "windows-core"
953-
version = "0.57.0"
954-
source = "registry+https://github.com/rust-lang/crates.io-index"
955-
checksum = "d2ed2439a290666cd67ecce2b0ffaad89c2a56b976b736e6ece670297897832d"
956-
dependencies = [
957-
"windows-implement 0.57.0",
958-
"windows-interface 0.57.0",
959-
"windows-result 0.1.2",
960-
"windows-targets",
938+
"windows-core",
961939
]
962940

963941
[[package]]
@@ -966,10 +944,10 @@ version = "0.61.0"
966944
source = "registry+https://github.com/rust-lang/crates.io-index"
967945
checksum = "4763c1de310c86d75a878046489e2e5ba02c649d185f21c67d4cf8a56d098980"
968946
dependencies = [
969-
"windows-implement 0.60.0",
970-
"windows-interface 0.59.1",
947+
"windows-implement",
948+
"windows-interface",
971949
"windows-link",
972-
"windows-result 0.3.2",
950+
"windows-result",
973951
"windows-strings",
974952
]
975953

@@ -979,21 +957,10 @@ version = "0.2.0"
979957
source = "registry+https://github.com/rust-lang/crates.io-index"
980958
checksum = "7a1d6bbefcb7b60acd19828e1bc965da6fcf18a7e39490c5f8be71e54a19ba32"
981959
dependencies = [
982-
"windows-core 0.61.0",
960+
"windows-core",
983961
"windows-link",
984962
]
985963

986-
[[package]]
987-
name = "windows-implement"
988-
version = "0.57.0"
989-
source = "registry+https://github.com/rust-lang/crates.io-index"
990-
checksum = "9107ddc059d5b6fbfbffdfa7a7fe3e22a226def0b2608f72e9d552763d3e1ad7"
991-
dependencies = [
992-
"proc-macro2",
993-
"quote",
994-
"syn",
995-
]
996-
997964
[[package]]
998965
name = "windows-implement"
999966
version = "0.60.0"
@@ -1005,17 +972,6 @@ dependencies = [
1005972
"syn",
1006973
]
1007974

1008-
[[package]]
1009-
name = "windows-interface"
1010-
version = "0.57.0"
1011-
source = "registry+https://github.com/rust-lang/crates.io-index"
1012-
checksum = "29bee4b38ea3cde66011baa44dba677c432a78593e202392d1e9070cf2a7fca7"
1013-
dependencies = [
1014-
"proc-macro2",
1015-
"quote",
1016-
"syn",
1017-
]
1018-
1019975
[[package]]
1020976
name = "windows-interface"
1021977
version = "0.59.1"
@@ -1039,19 +995,10 @@ version = "0.2.0"
1039995
source = "registry+https://github.com/rust-lang/crates.io-index"
1040996
checksum = "9150af68066c4c5c07ddc0ce30421554771e528bde427614c61038bc2c92c2b1"
1041997
dependencies = [
1042-
"windows-core 0.61.0",
998+
"windows-core",
1043999
"windows-link",
10441000
]
10451001

1046-
[[package]]
1047-
name = "windows-result"
1048-
version = "0.1.2"
1049-
source = "registry+https://github.com/rust-lang/crates.io-index"
1050-
checksum = "5e383302e8ec8515204254685643de10811af0ed97ea37210dc26fb0032647f8"
1051-
dependencies = [
1052-
"windows-targets",
1053-
]
1054-
10551002
[[package]]
10561003
name = "windows-result"
10571004
version = "0.3.2"

‎src/bootstrap/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ tracing-tree = { version = "0.4.0", optional = true }
7070
version = "1.0.0"
7171

7272
[target.'cfg(windows)'.dependencies.windows]
73-
version = "0.57"
73+
version = "0.61"
7474
features = [
7575
"Win32_Foundation",
7676
"Win32_Security",

‎src/bootstrap/src/bin/rustc.rs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -342,7 +342,7 @@ fn format_rusage_data(child: Child) -> Option<String> {
342342
use windows::Win32::System::Threading::GetProcessTimes;
343343
use windows::Win32::System::Time::FileTimeToSystemTime;
344344

345-
let handle = HANDLE(child.as_raw_handle() as isize);
345+
let handle = HANDLE(child.as_raw_handle());
346346

347347
let mut user_filetime = Default::default();
348348
let mut user_time = Default::default();

‎src/bootstrap/src/utils/job.rs

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,6 @@ mod for_windows {
6666
// Enable the Windows Error Reporting dialog which msys disables,
6767
// so we can JIT debug rustc
6868
let mode = SetErrorMode(THREAD_ERROR_MODE::default());
69-
let mode = THREAD_ERROR_MODE(mode);
7069
SetErrorMode(mode & !SEM_NOGPFAULTERRORBOX);
7170

7271
// Create a new job object for us to use

0 commit comments

Comments
 (0)