Skip to content

Commit 2cbbe8b

Browse files
committedJul 28, 2024·
Auto merge of rust-lang#128313 - GuillaumeGomez:rollup-kacb489, r=GuillaumeGomez
Rollup of 6 pull requests Successful merges: - rust-lang#125779 ([rustdoc] Add copy code feature) - rust-lang#127765 (Fix doc nits) - rust-lang#127860 (deps: dedup object, wasmparser, wasm-encoder) - rust-lang#128103 (add `is_multiple_of` for unsigned integer types) - rust-lang#128228 (Stabilize `const_waker`) - rust-lang#128240 (Add links from `assert_eq!` docs to `debug_assert_eq!`, etc.) r? `@ghost` `@rustbot` modify labels: rollup
2 parents 188ddf4 + eeb76cc commit 2cbbe8b

File tree

167 files changed

+1152
-871
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

167 files changed

+1152
-871
lines changed
 

‎Cargo.lock

+25-41
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]]
@@ -3344,10 +3338,10 @@ dependencies = [
33443338
"bstr",
33453339
"build_helper",
33463340
"gimli 0.31.0",
3347-
"object 0.34.0",
3341+
"object 0.36.2",
33483342
"regex",
33493343
"similar",
3350-
"wasmparser 0.118.2",
3344+
"wasmparser 0.214.0",
33513345
]
33523346

33533347
[[package]]
@@ -3653,7 +3647,7 @@ dependencies = [
36533647
"itertools",
36543648
"libc",
36553649
"measureme",
3656-
"object 0.32.2",
3650+
"object 0.36.2",
36573651
"rustc-demangle",
36583652
"rustc_ast",
36593653
"rustc_attr",
@@ -3692,7 +3686,7 @@ dependencies = [
36923686
"itertools",
36933687
"jobserver",
36943688
"libc",
3695-
"object 0.32.2",
3689+
"object 0.36.2",
36963690
"pathdiff",
36973691
"regex",
36983692
"rustc_arena",
@@ -3722,7 +3716,7 @@ dependencies = [
37223716
"thin-vec",
37233717
"thorin-dwp",
37243718
"tracing",
3725-
"wasm-encoder 0.200.0",
3719+
"wasm-encoder 0.210.0",
37263720
"windows",
37273721
]
37283722

@@ -4675,7 +4669,7 @@ name = "rustc_target"
46754669
version = "0.0.0"
46764670
dependencies = [
46774671
"bitflags 2.5.0",
4678-
"object 0.32.2",
4672+
"object 0.36.2",
46794673
"rustc_abi",
46804674
"rustc_data_structures",
46814675
"rustc_feature",
@@ -4960,12 +4954,11 @@ dependencies = [
49604954

49614955
[[package]]
49624956
name = "ruzstd"
4963-
version = "0.6.0"
4957+
version = "0.7.0"
49644958
source = "registry+https://github.com/rust-lang/crates.io-index"
4965-
checksum = "5174a470eeb535a721ae9fdd6e291c2411a906b96592182d05217591d5c5cf7b"
4959+
checksum = "5022b253619b1ba797f243056276bed8ed1a73b0f5a7ce7225d524067644bf8f"
49664960
dependencies = [
49674961
"byteorder",
4968-
"derive_more",
49694962
"twox-hash",
49704963
]
49714964

@@ -5252,7 +5245,7 @@ dependencies = [
52525245
"hermit-abi 0.4.0",
52535246
"libc",
52545247
"miniz_oxide",
5255-
"object 0.36.0",
5248+
"object 0.36.2",
52565249
"panic_abort",
52575250
"panic_unwind",
52585251
"profiler_builtins",
@@ -6188,15 +6181,6 @@ dependencies = [
61886181
"wasm-component-ld",
61896182
]
61906183

6191-
[[package]]
6192-
name = "wasm-encoder"
6193-
version = "0.200.0"
6194-
source = "registry+https://github.com/rust-lang/crates.io-index"
6195-
checksum = "b9e3fb0c8fbddd78aa6095b850dfeedbc7506cf5f81e633f69cf8f2333ab84b9"
6196-
dependencies = [
6197-
"leb128",
6198-
]
6199-
62006184
[[package]]
62016185
name = "wasm-encoder"
62026186
version = "0.210.0"
@@ -6233,26 +6217,26 @@ dependencies = [
62336217

62346218
[[package]]
62356219
name = "wasmparser"
6236-
version = "0.118.2"
6220+
version = "0.210.0"
62376221
source = "registry+https://github.com/rust-lang/crates.io-index"
6238-
checksum = "77f1154f1ab868e2a01d9834a805faca7bf8b50d041b4ca714d005d0dab1c50c"
6222+
checksum = "a7bbcd21e7581619d9f6ca00f8c4f08f1cacfe58bf63f83af57cd0476f1026f5"
62396223
dependencies = [
6224+
"ahash",
6225+
"bitflags 2.5.0",
6226+
"hashbrown",
62406227
"indexmap",
62416228
"semver",
6229+
"serde",
62426230
]
62436231

62446232
[[package]]
62456233
name = "wasmparser"
6246-
version = "0.210.0"
6234+
version = "0.214.0"
62476235
source = "registry+https://github.com/rust-lang/crates.io-index"
6248-
checksum = "a7bbcd21e7581619d9f6ca00f8c4f08f1cacfe58bf63f83af57cd0476f1026f5"
6236+
checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6"
62496237
dependencies = [
6250-
"ahash",
62516238
"bitflags 2.5.0",
6252-
"hashbrown",
62536239
"indexmap",
6254-
"semver",
6255-
"serde",
62566240
]
62576241

62586242
[[package]]

‎compiler/rustc_codegen_llvm/Cargo.toml

+1-1
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" }

0 commit comments

Comments
 (0)
Please sign in to comment.