Skip to content

Commit d614cf8

Browse files
committed
dedup object
waiting on thorin-dwp update
1 parent cb1bf93 commit d614cf8

File tree

5 files changed

+28
-26
lines changed

5 files changed

+28
-26
lines changed

Cargo.lock

Lines changed: 24 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -2571,18 +2571,6 @@ dependencies = [
25712571
"indexmap",
25722572
"memchr",
25732573
"ruzstd 0.5.0",
2574-
"wasmparser 0.118.2",
2575-
]
2576-
2577-
[[package]]
2578-
name = "object"
2579-
version = "0.34.0"
2580-
source = "registry+https://github.com/rust-lang/crates.io-index"
2581-
checksum = "d7090bae93f8585aad99e595b7073c5de9ba89fbd6b4e9f0cdd7a10177273ac8"
2582-
dependencies = [
2583-
"flate2",
2584-
"memchr",
2585-
"ruzstd 0.6.0",
25862574
]
25872575

25882576
[[package]]
@@ -2596,14 +2584,20 @@ dependencies = [
25962584

25972585
[[package]]
25982586
name = "object"
2599-
version = "0.36.0"
2587+
version = "0.36.2"
26002588
source = "registry+https://github.com/rust-lang/crates.io-index"
2601-
checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
2589+
checksum = "3f203fa8daa7bb185f760ae12bd8e097f63d17041dcdcaf675ac54cdf863170e"
26022590
dependencies = [
26032591
"compiler_builtins",
2592+
"crc32fast",
2593+
"flate2",
2594+
"hashbrown",
2595+
"indexmap",
26042596
"memchr",
26052597
"rustc-std-workspace-alloc",
26062598
"rustc-std-workspace-core",
2599+
"ruzstd 0.7.0",
2600+
"wasmparser 0.214.0",
26072601
]
26082602

26092603
[[package]]
@@ -3334,7 +3328,7 @@ dependencies = [
33343328
"bstr",
33353329
"build_helper",
33363330
"gimli 0.31.0",
3337-
"object 0.34.0",
3331+
"object 0.36.2",
33383332
"regex",
33393333
"similar",
33403334
"wasmparser 0.118.2",
@@ -3643,7 +3637,7 @@ dependencies = [
36433637
"itertools",
36443638
"libc",
36453639
"measureme",
3646-
"object 0.32.2",
3640+
"object 0.36.2",
36473641
"rustc-demangle",
36483642
"rustc_ast",
36493643
"rustc_attr",
@@ -3682,7 +3676,7 @@ dependencies = [
36823676
"itertools",
36833677
"jobserver",
36843678
"libc",
3685-
"object 0.32.2",
3679+
"object 0.36.2",
36863680
"pathdiff",
36873681
"regex",
36883682
"rustc_arena",
@@ -4666,7 +4660,7 @@ name = "rustc_target"
46664660
version = "0.0.0"
46674661
dependencies = [
46684662
"bitflags 2.5.0",
4669-
"object 0.32.2",
4663+
"object 0.36.2",
46704664
"rustc_abi",
46714665
"rustc_data_structures",
46724666
"rustc_feature",
@@ -4951,12 +4945,11 @@ dependencies = [
49514945

49524946
[[package]]
49534947
name = "ruzstd"
4954-
version = "0.6.0"
4948+
version = "0.7.0"
49554949
source = "registry+https://github.com/rust-lang/crates.io-index"
4956-
checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b"
4950+
checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f"
49574951
dependencies = [
49584952
"byteorder",
4959-
"derive_more",
49604953
"twox-hash",
49614954
]
49624955

@@ -5242,7 +5235,7 @@ dependencies = [
52425235
"hermit-abi 0.4.0",
52435236
"libc",
52445237
"miniz_oxide",
5245-
"object 0.36.0",
5238+
"object 0.36.2",
52465239
"panic_abort",
52475240
"panic_unwind",
52485241
"profiler_builtins",
@@ -6246,6 +6239,15 @@ dependencies = [
62466239
"serde",
62476240
]
62486241

6242+
[[package]]
6243+
name = "wasmparser"
6244+
version = "0.214.0"
6245+
source = "registry+https://github.com/rust-lang/crates.io-index"
6246+
checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6"
6247+
dependencies = [
6248+
"bitflags 2.5.0",
6249+
]
6250+
62496251
[[package]]
62506252
name = "wast"
62516253
version = "211.0.1"

compiler/rustc_codegen_llvm/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@ bitflags = "2.4.1"
1212
itertools = "0.12"
1313
libc = "0.2"
1414
measureme = "11"
15-
object = { version = "0.32.0", default-features = false, features = ["std", "read"] }
15+
object = { version = "0.36.2", default-features = false, features = ["std", "read"] }
1616
rustc-demangle = "0.1.21"
1717
rustc_ast = { path = "../rustc_ast" }
1818
rustc_attr = { path = "../rustc_attr" }

compiler/rustc_codegen_ssa/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -50,7 +50,7 @@ libc = "0.2.50"
5050
# tidy-alphabetical-end
5151

5252
[dependencies.object]
53-
version = "0.32.1"
53+
version = "0.36.2"
5454
default-features = false
5555
features = ["read_core", "elf", "macho", "pe", "xcoff", "unaligned", "archive", "write", "wasm"]
5656

compiler/rustc_target/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,5 +22,5 @@ tracing = "0.1"
2222
# tidy-alphabetical-start
2323
default-features = false
2424
features = ["elf", "macho"]
25-
version = "0.32.0"
25+
version = "0.36.2"
2626
# tidy-alphabetical-end

src/tools/run-make-support/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ edition = "2021"
55

66
[dependencies]
77
bstr = "1.6.0"
8-
object = "0.34.0"
8+
object = "0.36.2"
99
similar = "2.5.0"
1010
wasmparser = "0.118.2"
1111
regex = "1.8" # 1.8 to avoid memchr 2.6.0, as 2.5.0 is pinned in the workspace

0 commit comments

Comments
 (0)