diff --git a/Cargo.lock b/Cargo.lock index c427f6a92a0f0..a910f4f5bf1bb 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -848,7 +848,7 @@ version = "3.1.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "faf9468729b8cbcea668e36183cb69d317348c2e08e994829fb56ebfdfbaac34" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1261,7 +1261,7 @@ dependencies = [ "libc", "option-ext", "redox_users", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1388,7 +1388,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "39cab71617ae0d63f51a36d69f866391735b51691dbda63cf6f96d042b63efeb" dependencies = [ "libc", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -1411,12 +1411,6 @@ dependencies = [ "once_cell", ] -[[package]] -name = "fallible-iterator" -version = "0.3.0" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "2acce4a10f12dc2fb14a218589d4f1f62ef011b2d0cc4b3cb1bba8e94da14649" - [[package]] name = "fastrand" version = "2.3.0" @@ -1630,19 +1624,15 @@ name = "gimli" version = "0.31.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f" -dependencies = [ - "fallible-iterator", - "indexmap", - "stable_deref_trait", -] [[package]] name = "gimli" -version = "0.32.3" +version = "0.33.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e629b9b98ef3dd8afe6ca2bd0f89306cec16d43d907889945bc5d6687f2f13c7" +checksum = "0bf7f043f89559805f8c7cacc432749b2fa0d0a0a9ee46ce47164ed5ba7f126c" dependencies = [ - "fallible-iterator", + "fnv", + "hashbrown 0.16.1", "indexmap", "stable_deref_trait", ] @@ -1695,10 +1685,19 @@ name = "hashbrown" version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" +dependencies = [ + "foldhash 0.1.5", +] + +[[package]] +name = "hashbrown" +version = "0.16.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "841d1cc9bed7f9236f321df977030373f4a4163ae1a7dbfe1a51a2c1a51d9100" dependencies = [ "allocator-api2", "equivalent", - "foldhash 0.1.5", + "foldhash 0.2.0", ] [[package]] @@ -2166,7 +2165,7 @@ dependencies = [ "portable-atomic", "portable-atomic-util", "serde_core", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2653,7 +2652,7 @@ version = "0.50.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7957b9740744892f114936ab4a57b3f487491bbeafaf8083688b16841a4240e5" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -2779,12 +2778,7 @@ version = "0.36.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87" dependencies = [ - "crc32fast", - "flate2", - "hashbrown 0.15.5", - "indexmap", "memchr", - "ruzstd 0.7.3", ] [[package]] @@ -2792,14 +2786,23 @@ name = "object" version = "0.37.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +dependencies = [ + "memchr", +] + +[[package]] +name = "object" +version = "0.38.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "271638cd5fa9cca89c4c304675ca658efc4e64a66c716b7cfe1afb4b9611dbbc" dependencies = [ "crc32fast", "flate2", - "hashbrown 0.15.5", + "hashbrown 0.16.1", "indexmap", "memchr", - "ruzstd 0.8.2", - "wasmparser 0.236.1", + "ruzstd", + "wasmparser 0.243.0", ] [[package]] @@ -3506,15 +3509,15 @@ version = "0.0.0" dependencies = [ "bstr", "build_helper", - "gimli 0.32.3", + "gimli 0.33.0", "libc", - "object 0.37.3", + "object 0.38.1", "regex", "rustdoc-json-types", "serde_json", "similar", "tempfile", - "wasmparser 0.236.1", + "wasmparser 0.243.0", ] [[package]] @@ -3798,12 +3801,12 @@ name = "rustc_codegen_llvm" version = "0.0.0" dependencies = [ "bitflags", - "gimli 0.31.1", + "gimli 0.33.0", "itertools", "libc", "libloading 0.9.0", "measureme", - "object 0.37.3", + "object 0.38.1", "rustc-demangle", "rustc_abi", "rustc_ast", @@ -3837,7 +3840,7 @@ dependencies = [ "find-msvc-tools", "itertools", "libc", - "object 0.37.3", + "object 0.38.1", "pathdiff", "regex", "rustc_abi", @@ -4802,7 +4805,7 @@ version = "0.0.0" dependencies = [ "arrayvec", "bitflags", - "object 0.37.3", + "object 0.38.1", "rustc_abi", "rustc_data_structures", "rustc_error_messages", @@ -5085,7 +5088,7 @@ dependencies = [ "errno", "libc", "linux-raw-sys", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5094,15 +5097,6 @@ version = "1.0.22" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b39cdef0fa800fc44525c84ccb54a029961a8215f9619753635a9c0d2538d46d" -[[package]] -name = "ruzstd" -version = "0.7.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "fad02996bfc73da3e301efe90b1837be9ed8f4a462b6ed410aa35d00381de89f" -dependencies = [ - "twox-hash 1.6.3", -] - [[package]] name = "ruzstd" version = "0.8.2" @@ -5517,7 +5511,7 @@ dependencies = [ "getrandom 0.3.3", "once_cell", "rustix", - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5536,7 +5530,7 @@ version = "1.2.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "d8c27177b12a6399ffc08b98f76f7c9a1f4fe9fc967c784c5a071fa8d93cf7e1" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] @@ -5623,13 +5617,13 @@ dependencies = [ [[package]] name = "thorin-dwp" -version = "0.9.0" +version = "0.10.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9e9c1e705f82a260173f3eec93f2ff6d7807f23ad5a8cc2e7316a891733ea7a1" +checksum = "6ce6b46108e50803d2c10216929e49fa3eda07ee3dc246310c18c4a1e3b1fa58" dependencies = [ - "gimli 0.31.1", - "hashbrown 0.15.5", - "object 0.36.7", + "gimli 0.33.0", + "hashbrown 0.16.1", + "object 0.38.1", "tracing", ] @@ -6431,9 +6425,9 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.236.1" +version = "0.243.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "a9b1e81f3eb254cf7404a82cee6926a4a3ccc5aad80cc3d43608a070c67aa1d7" +checksum = "f6d8db401b0528ec316dfbe579e6ab4152d61739cfe076706d2009127970159d" dependencies = [ "bitflags", "indexmap", @@ -6514,7 +6508,7 @@ version = "0.1.11" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "c2a7b1c03c876122aa43f3020e6c3c3ee5c05081c9a00739faf7503aeba10d22" dependencies = [ - "windows-sys 0.59.0", + "windows-sys 0.61.2", ] [[package]] diff --git a/compiler/rustc_codegen_llvm/Cargo.toml b/compiler/rustc_codegen_llvm/Cargo.toml index 8beb69f7b37d1..f085eba9d5307 100644 --- a/compiler/rustc_codegen_llvm/Cargo.toml +++ b/compiler/rustc_codegen_llvm/Cargo.toml @@ -11,12 +11,12 @@ test = false bitflags = "2.4.1" # To avoid duplicate dependencies, this should match the version of gimli used # by `rustc_codegen_ssa` via its `thorin-dwp` dependency. -gimli = "0.31" +gimli = "0.33" itertools = "0.15" libc = "0.2" libloading = { version = "0.9.0" } measureme = "12.0.1" -object = { version = "0.37.0", default-features = false, features = ["std", "read"] } +object = { version = "0.38.1", default-features = false, features = ["std", "read"] } rustc-demangle = "0.1.28" rustc_abi = { path = "../rustc_abi" } rustc_ast = { path = "../rustc_ast" } diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml index dd881b14d2920..f33d144ac5c63 100644 --- a/compiler/rustc_codegen_ssa/Cargo.toml +++ b/compiler/rustc_codegen_ssa/Cargo.toml @@ -37,7 +37,7 @@ rustc_trait_selection = { path = "../rustc_trait_selection" } serde_json = "1.0.59" smallvec = { version = "1.8.1", features = ["union", "may_dangle"] } tempfile = "3.2" -thorin-dwp = "0.9" +thorin-dwp = "0.10" tracing = "0.1" wasm-encoder = "0.219" # tidy-alphabetical-end @@ -48,7 +48,7 @@ libc = "0.2.50" # tidy-alphabetical-end [dependencies.object] -version = "0.37.0" +version = "0.38.1" default-features = false features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"] diff --git a/compiler/rustc_codegen_ssa/src/diagnostics.rs b/compiler/rustc_codegen_ssa/src/diagnostics.rs index 599a23ec0ddc1..6b182d795a9ec 100644 --- a/compiler/rustc_codegen_ssa/src/diagnostics.rs +++ b/compiler/rustc_codegen_ssa/src/diagnostics.rs @@ -261,9 +261,6 @@ impl Diagnostic<'_, G> for ThorinErrorWrapper { thorin::Error::ParseUnitAbbreviations(_) => { build(msg!("failed to parse unit abbreviations")) } - thorin::Error::ParseUnitAttribute(_) => { - build(msg!("failed to parse unit attribute")) - } thorin::Error::ParseUnitHeader(_) => { build(msg!("failed to parse unit header")) } diff --git a/compiler/rustc_target/Cargo.toml b/compiler/rustc_target/Cargo.toml index d399bfcda50b5..02a5beaef2a6f 100644 --- a/compiler/rustc_target/Cargo.toml +++ b/compiler/rustc_target/Cargo.toml @@ -7,7 +7,7 @@ edition = "2024" # tidy-alphabetical-start arrayvec = { version = "0.7", default-features = false } bitflags = "2.4.1" -object = { version = "0.37.0", default-features = false, features = ["elf", "macho"] } +object = { version = "0.38.1", default-features = false, features = ["elf", "macho"] } rustc_abi = { path = "../rustc_abi" } rustc_data_structures = { path = "../rustc_data_structures" } rustc_error_messages = { path = "../rustc_error_messages" } diff --git a/src/bootstrap/Cargo.lock b/src/bootstrap/Cargo.lock index c05eeb97829b3..1f2ad0eacf759 100644 --- a/src/bootstrap/Cargo.lock +++ b/src/bootstrap/Cargo.lock @@ -483,9 +483,9 @@ dependencies = [ [[package]] name = "object" -version = "0.37.3" +version = "0.38.1" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "ff76201f031d8863c38aa7f905eca4f53abbfa15f609db4277d44cd8938f33fe" +checksum = "271638cd5fa9cca89c4c304675ca658efc4e64a66c716b7cfe1afb4b9611dbbc" dependencies = [ "memchr", ] diff --git a/src/bootstrap/Cargo.toml b/src/bootstrap/Cargo.toml index cb96af268a6aa..51e4396e6f577 100644 --- a/src/bootstrap/Cargo.toml +++ b/src/bootstrap/Cargo.toml @@ -41,7 +41,7 @@ clap_complete = "4.4" home = "0.5" ignore = "0.4" libc = "0.2" -object = { version = "0.37", default-features = false, features = ["archive", "coff", "read_core", "std", "unaligned"] } +object = { version = "0.38.1", default-features = false, features = ["archive", "coff", "read_core", "std", "unaligned"] } opener = "0.8" semver = "1.0" serde = "1.0" diff --git a/src/bootstrap/src/utils/proc_macro_deps.rs b/src/bootstrap/src/utils/proc_macro_deps.rs index 6dde0ae28064b..8e91f95e18f3f 100644 --- a/src/bootstrap/src/utils/proc_macro_deps.rs +++ b/src/bootstrap/src/utils/proc_macro_deps.rs @@ -3,7 +3,6 @@ /// See pub static CRATES: &[&str] = &[ // tidy-alphabetical-start - "allocator-api2", "anyhow", "askama_derive", "askama_parser", diff --git a/src/tools/run-make-support/Cargo.toml b/src/tools/run-make-support/Cargo.toml index c1bff4f94272c..697652012d48c 100644 --- a/src/tools/run-make-support/Cargo.toml +++ b/src/tools/run-make-support/Cargo.toml @@ -11,14 +11,14 @@ edition = "2024" # tidy-alphabetical-start bstr = "1.12" -gimli = "0.32" +gimli = "0.33" libc = "0.2" -object = { version = "0.37", features = ["wasm"] } +object = { version = "0.38.1", features = ["wasm"] } regex = "1.11" serde_json = "1.0" similar = "2.7" tempfile = "3" -wasmparser = { version = "0.236", default-features = false, features = ["std", "features", "validate"] } +wasmparser = { version = "0.243", default-features = false, features = ["std", "features", "validate"] } # tidy-alphabetical-end # Shared with bootstrap and compiletest diff --git a/src/tools/tidy/src/deps.rs b/src/tools/tidy/src/deps.rs index 342743d21340f..6d5a3ee4e8298 100644 --- a/src/tools/tidy/src/deps.rs +++ b/src/tools/tidy/src/deps.rs @@ -340,7 +340,6 @@ const PERMITTED_RUSTC_DEPENDENCIES: &[&str] = &[ "equivalent", "errno", "expect-test", - "fallible-iterator", // dependency of `thorin` "fastrand", "find-msvc-tools", "flate2", diff --git a/tests/run-make/repr128-dwarf/rmake.rs b/tests/run-make/repr128-dwarf/rmake.rs index 38c69d5107337..6b381f1f10bf4 100644 --- a/tests/run-make/repr128-dwarf/rmake.rs +++ b/tests/run-make/repr128-dwarf/rmake.rs @@ -59,21 +59,17 @@ fn main() { let unit = dwarf.unit(header).unwrap(); let mut cursor = unit.entries(); - let get_name = |entry: &DebuggingInformationEntry<'_, '_, _>| { + let get_name = |entry: &DebuggingInformationEntry<_>| { let name = dwarf - .attr_string( - &unit, - entry.attr(gimli::constants::DW_AT_name).unwrap().unwrap().value(), - ) + .attr_string(&unit, entry.attr(gimli::constants::DW_AT_name).unwrap().value()) .unwrap(); name.to_string().unwrap().to_string() }; - while let Some((_, entry)) = cursor.next_dfs().unwrap() { + while let Some(entry) = cursor.next_dfs().unwrap() { match entry.tag() { gimli::constants::DW_TAG_variant => { - let Some(value) = entry.attr(gimli::constants::DW_AT_discr_value).unwrap() - else { + let Some(value) = entry.attr(gimli::constants::DW_AT_discr_value) else { // `std` enums might have variants without `DW_AT_discr_value`. continue; }; @@ -84,9 +80,11 @@ fn main() { }; // The `DW_TAG_member` that is a child of `DW_TAG_variant` will contain the // variant's name. - let Some((1, child_entry)) = cursor.next_dfs().unwrap() else { + let entry_depth = entry.depth; + let Some(child_entry) = cursor.next_dfs().unwrap() else { panic!("Missing child of DW_TAG_variant"); }; + assert_eq!(child_entry.depth, entry_depth + 1); assert_eq!(child_entry.tag(), gimli::constants::DW_TAG_member); let name = get_name(child_entry); if let Some(expected) = variants_to_find.remove(name.as_str()) { @@ -99,12 +97,7 @@ fn main() { gimli::constants::DW_TAG_enumerator => { let name = get_name(entry); if let Some(expected) = enumerators_to_find.remove(name.as_str()) { - match entry - .attr(gimli::constants::DW_AT_const_value) - .unwrap() - .unwrap() - .value() - { + match entry.attr(gimli::constants::DW_AT_const_value).unwrap().value() { AttributeValue::Block(value) => { // This test uses LE byte order is used for consistent values across // architectures.