Skip to content

Commit d48d535

Browse files
committed
dedup object
waiting on thorin-dwp update
1 parent cb12b52 commit d48d535

File tree

5 files changed

+23
-20
lines changed

5 files changed

+23
-20
lines changed

Cargo.lock

Lines changed: 19 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -2641,18 +2641,6 @@ dependencies = [
26412641
"indexmap",
26422642
"memchr",
26432643
"ruzstd 0.5.0",
2644-
"wasmparser 0.118.2",
2645-
]
2646-
2647-
[[package]]
2648-
name = "object"
2649-
version = "0.34.0"
2650-
source = "registry+https://github.com/rust-lang/crates.io-index"
2651-
checksum = "d7090bae93f8585aad99e595b7073c5de9ba89fbd6b4e9f0cdd7a10177273ac8"
2652-
dependencies = [
2653-
"flate2",
2654-
"memchr",
2655-
"ruzstd 0.6.0",
26562644
]
26572645

26582646
[[package]]
@@ -2671,9 +2659,15 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
26712659
checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
26722660
dependencies = [
26732661
"compiler_builtins",
2662+
"crc32fast",
2663+
"flate2",
2664+
"hashbrown",
2665+
"indexmap",
26742666
"memchr",
26752667
"rustc-std-workspace-alloc",
26762668
"rustc-std-workspace-core",
2669+
"ruzstd 0.6.0",
2670+
"wasmparser 0.208.1",
26772671
]
26782672

26792673
[[package]]
@@ -3448,7 +3442,7 @@ dependencies = [
34483442
"bstr",
34493443
"build_helper",
34503444
"gimli 0.31.0",
3451-
"object 0.34.0",
3445+
"object 0.36.0",
34523446
"regex",
34533447
"similar",
34543448
"wasmparser 0.118.2",
@@ -3769,7 +3763,7 @@ dependencies = [
37693763
"itertools",
37703764
"libc",
37713765
"measureme",
3772-
"object 0.32.2",
3766+
"object 0.36.0",
37733767
"rustc-demangle",
37743768
"rustc_ast",
37753769
"rustc_attr",
@@ -3808,7 +3802,7 @@ dependencies = [
38083802
"itertools",
38093803
"jobserver",
38103804
"libc",
3811-
"object 0.32.2",
3805+
"object 0.36.0",
38123806
"pathdiff",
38133807
"regex",
38143808
"rustc_arena",
@@ -4791,7 +4785,7 @@ name = "rustc_target"
47914785
version = "0.0.0"
47924786
dependencies = [
47934787
"bitflags 2.5.0",
4794-
"object 0.32.2",
4788+
"object 0.36.0",
47954789
"rustc_abi",
47964790
"rustc_data_structures",
47974791
"rustc_feature",
@@ -6414,6 +6408,15 @@ dependencies = [
64146408
"semver",
64156409
]
64166410

6411+
[[package]]
6412+
name = "wasmparser"
6413+
version = "0.208.1"
6414+
source = "registry+https://github.com/rust-lang/crates.io-index"
6415+
checksum = "dd921789c9dcc495f589cb37d200155dee65b4a4beeb853323b5e24e0a5f9c58"
6416+
dependencies = [
6417+
"bitflags 2.5.0",
6418+
]
6419+
64176420
[[package]]
64186421
name = "wasmparser"
64196422
version = "0.210.0"

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.0", 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.0"
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.0"
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.0"
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)