diff --git a/Cargo.lock b/Cargo.lock
index 0d2ae4ee15fa1..ebb8d114f2af9 100644
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -355,7 +355,7 @@ dependencies = [
name = "cargo-miri"
version = "0.1.0"
dependencies = [
- "cargo_metadata 0.18.1",
+ "cargo_metadata",
"directories",
"rustc-build-sysroot",
"rustc_tools_util",
@@ -373,20 +373,6 @@ dependencies = [
"serde",
]
-[[package]]
-name = "cargo_metadata"
-version = "0.15.4"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "eee4243f1f26fc7a42710e7439c149e2b10b05472f88090acce52632f231a73a"
-dependencies = [
- "camino",
- "cargo-platform",
- "semver",
- "serde",
- "serde_json",
- "thiserror",
-]
-
[[package]]
name = "cargo_metadata"
version = "0.18.1"
@@ -533,7 +519,7 @@ name = "clippy"
version = "0.1.83"
dependencies = [
"anstream",
- "cargo_metadata 0.18.1",
+ "cargo_metadata",
"clippy_config",
"clippy_lints",
"clippy_utils",
@@ -585,7 +571,7 @@ name = "clippy_lints"
version = "0.1.83"
dependencies = [
"arrayvec",
- "cargo_metadata 0.18.1",
+ "cargo_metadata",
"clippy_config",
"clippy_utils",
"declare_clippy_lint",
@@ -718,7 +704,7 @@ dependencies = [
"tracing-subscriber",
"unified-diff",
"walkdir",
- "windows 0.52.0",
+ "windows",
]
[[package]]
@@ -966,17 +952,6 @@ dependencies = [
"syn 2.0.77",
]
-[[package]]
-name = "derive_more"
-version = "0.99.18"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "5f33878137e4dafd7fa914ad4e259e18a4e8e532b9617a2d0150262bf53abfce"
-dependencies = [
- "proc-macro2",
- "quote",
- "syn 2.0.77",
-]
-
[[package]]
name = "derive_setters"
version = "0.1.6"
@@ -1393,7 +1368,7 @@ name = "generate-copyright"
version = "0.1.0"
dependencies = [
"anyhow",
- "cargo_metadata 0.18.1",
+ "cargo_metadata",
"rinja",
"serde",
"serde_json",
@@ -1442,6 +1417,12 @@ name = "gimli"
version = "0.28.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4271d37baee1b8c7e4b708028c57d816cf9d2434acb33a549475f78c181f6253"
+
+[[package]]
+name = "gimli"
+version = "0.30.0"
+source = "registry+https://github.com/rust-lang/crates.io-index"
+checksum = "e2e1d97fbe9722ba9bbd0c97051c2956e726562b61f86a25a4360398a40edfc9"
dependencies = [
"fallible-iterator",
"indexmap",
@@ -2448,12 +2429,7 @@ version = "0.32.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
dependencies = [
- "crc32fast",
- "flate2",
- "hashbrown",
- "indexmap",
"memchr",
- "ruzstd 0.5.0",
]
[[package]]
@@ -2467,7 +2443,7 @@ dependencies = [
"hashbrown",
"indexmap",
"memchr",
- "ruzstd 0.7.2",
+ "ruzstd",
"wasmparser 0.216.0",
]
@@ -3481,7 +3457,7 @@ dependencies = [
"thorin-dwp",
"tracing",
"wasm-encoder 0.216.0",
- "windows 0.52.0",
+ "windows",
]
[[package]]
@@ -3538,7 +3514,7 @@ dependencies = [
"tempfile",
"thin-vec",
"tracing",
- "windows 0.52.0",
+ "windows",
]
[[package]]
@@ -3600,7 +3576,7 @@ dependencies = [
"shlex",
"time",
"tracing",
- "windows 0.52.0",
+ "windows",
]
[[package]]
@@ -3651,7 +3627,7 @@ dependencies = [
"termcolor",
"termize",
"tracing",
- "windows 0.52.0",
+ "windows",
]
[[package]]
@@ -4374,7 +4350,7 @@ dependencies = [
"smallvec",
"termize",
"tracing",
- "windows 0.52.0",
+ "windows",
]
[[package]]
@@ -4657,7 +4633,7 @@ dependencies = [
"annotate-snippets 0.9.2",
"anyhow",
"bytecount",
- "cargo_metadata 0.18.1",
+ "cargo_metadata",
"clap",
"clap-cargo",
"diff",
@@ -4698,17 +4674,6 @@ version = "1.0.17"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "955d28af4278de8121b7ebeb796b6a45735dc01436d898801014aced2773a3d6"
-[[package]]
-name = "ruzstd"
-version = "0.5.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "58c4eb8a81997cf040a091d1f7e1938aeab6749d3a0dfa73af43cdc32393483d"
-dependencies = [
- "byteorder",
- "derive_more",
- "twox-hash",
-]
-
[[package]]
name = "ruzstd"
version = "0.7.2"
@@ -5087,7 +5052,7 @@ checksum = "355dbe4f8799b304b05e1b0f05fc59b2a18d36645cf169607da45bde2f69a1be"
dependencies = [
"core-foundation-sys",
"libc",
- "windows 0.57.0",
+ "windows",
]
[[package]]
@@ -5214,13 +5179,13 @@ dependencies = [
[[package]]
name = "thorin-dwp"
-version = "0.7.0"
+version = "0.8.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "4db52ee8fec06e119b692ef3dd2c4cf621a99204c1b8c47407870ed050305b9b"
+checksum = "813ba76597db32dc4f6992fd8bf8f394715b88d352fd97401da67dab6283b4c6"
dependencies = [
- "gimli 0.28.1",
+ "gimli 0.30.0",
"hashbrown",
- "object 0.32.2",
+ "object 0.36.4",
"tracing",
]
@@ -5248,7 +5213,7 @@ name = "tidy"
version = "0.1.0"
dependencies = [
"build_helper",
- "cargo_metadata 0.15.4",
+ "cargo_metadata",
"fluent-syntax",
"ignore",
"miropt-test-tools",
@@ -5516,7 +5481,7 @@ dependencies = [
"anyhow",
"bstr",
"cargo-platform",
- "cargo_metadata 0.18.1",
+ "cargo_metadata",
"color-eyre",
"colored",
"comma",
@@ -5938,16 +5903,6 @@ version = "0.4.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "712e227841d057c1ee1cd2fb22fa7e5a5461ae8e48fa2ca79ec42cfc1931183f"
-[[package]]
-name = "windows"
-version = "0.52.0"
-source = "registry+https://github.com/rust-lang/crates.io-index"
-checksum = "e48a53791691ab099e5e2ad123536d0fff50652600abaf43bbf952894110d0be"
-dependencies = [
- "windows-core 0.52.0",
- "windows-targets 0.52.6",
-]
-
[[package]]
name = "windows"
version = "0.57.0"
diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
index 3ab4cd0a0f53c..81590674ec7c1 100644
--- a/compiler/rustc_codegen_ssa/Cargo.toml
+++ b/compiler/rustc_codegen_ssa/Cargo.toml
@@ -39,7 +39,7 @@ serde_json = "1.0.59"
smallvec = { version = "1.8.1", features = ["union", "may_dangle"] }
tempfile = "3.2"
thin-vec = "0.2.12"
-thorin-dwp = "0.7"
+thorin-dwp = "0.8"
tracing = "0.1"
wasm-encoder = "0.216.0"
# tidy-alphabetical-end
@@ -55,5 +55,5 @@ default-features = false
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
+version = "0.57.0"
features = ["Win32_Globalization"]
diff --git a/compiler/rustc_data_structures/Cargo.toml b/compiler/rustc_data_structures/Cargo.toml
index 38c6c8a8d11c7..d73cf11ee64d6 100644
--- a/compiler/rustc_data_structures/Cargo.toml
+++ b/compiler/rustc_data_structures/Cargo.toml
@@ -32,7 +32,7 @@ tracing = "0.1"
version = "0.12"
[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
+version = "0.57.0"
features = [
"Win32_Foundation",
"Win32_Storage_FileSystem",
diff --git a/compiler/rustc_driver_impl/Cargo.toml b/compiler/rustc_driver_impl/Cargo.toml
index 6d6d3f35a4b1b..ef577c0321899 100644
--- a/compiler/rustc_driver_impl/Cargo.toml
+++ b/compiler/rustc_driver_impl/Cargo.toml
@@ -59,7 +59,7 @@ libc = "0.2"
# tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
+version = "0.57.0"
features = [
"Win32_System_Diagnostics_Debug",
]
diff --git a/compiler/rustc_errors/Cargo.toml b/compiler/rustc_errors/Cargo.toml
index 59cf4e5f210b7..00eaf4d5a862d 100644
--- a/compiler/rustc_errors/Cargo.toml
+++ b/compiler/rustc_errors/Cargo.toml
@@ -29,7 +29,7 @@ tracing = "0.1"
# tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
+version = "0.57.0"
features = [
"Win32_Foundation",
"Win32_Security",
diff --git a/compiler/rustc_session/Cargo.toml b/compiler/rustc_session/Cargo.toml
index 721a9275d0188..75cc8f18a5455 100644
--- a/compiler/rustc_session/Cargo.toml
+++ b/compiler/rustc_session/Cargo.toml
@@ -30,7 +30,7 @@ libc = "0.2"
# tidy-alphabetical-end
[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
+version = "0.57.0"
features = [
"Win32_Foundation",
"Win32_System_LibraryLoader",
diff --git a/src/tools/compiletest/Cargo.toml b/src/tools/compiletest/Cargo.toml
index 52beb4c8b3dec..b6a89dd49e615 100644
--- a/src/tools/compiletest/Cargo.toml
+++ b/src/tools/compiletest/Cargo.toml
@@ -33,7 +33,7 @@ libc = "0.2"
miow = "0.6"
[target.'cfg(windows)'.dependencies.windows]
-version = "0.52.0"
+version = "0.57.0"
features = [
"Win32_Foundation",
"Win32_System_Diagnostics_Debug",
diff --git a/src/tools/tidy/Cargo.toml b/src/tools/tidy/Cargo.toml
index 1acdf9fbc7fc8..928867be64f83 100644
--- a/src/tools/tidy/Cargo.toml
+++ b/src/tools/tidy/Cargo.toml
@@ -6,7 +6,7 @@ autobins = false
[dependencies]
build_helper = { path = "../build_helper" }
-cargo_metadata = "0.15"
+cargo_metadata = "0.18"
regex = "1"
miropt-test-tools = { path = "../miropt-test-tools" }
walkdir = "2"
diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs
index b880f312715ec..ca6f9346d2589 100644
--- a/src/tools/tidy/src/deps.rs
+++ b/src/tools/tidy/src/deps.rs
@@ -271,7 +271,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"datafrog",
"deranged",
"derive-where",
- "derive_more",
"derive_setters",
"digest",
"displaydoc",
@@ -435,6 +434,9 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[
"winapi-x86_64-pc-windows-gnu",
"windows",
"windows-core",
+ "windows-implement",
+ "windows-interface",
+ "windows-result",
"windows-sys",
"windows-targets",
"windows_aarch64_gnullvm",