Skip to content

Commit e8dfa76

Browse files
authored
Unrolled build for #142308
Rollup merge of #142308 - tgross35:upgrade-library-object, r=Mark-Simulacrum Upgrade `object`, `addr2line`, and `unwinding` in the standard library Object: 0.37.0 is a semver-breaking release but the only breakage is in `elf::R_RISCV_GNU_*` and `pe::IMAGE_WEAK_EXTERN_*` constants, as well as Mach-O dyld. This API is not used by `std`, so we should be fine to upgrade. This new version also includes functionality for parsing Wasm object files that we may eventually like to make use of. Changelog: https://github.com/gimli-rs/object/blob/master/CHANGELOG.md#0370 Addr2line: 0.25.0 is a breaking change only because it upgrades the `gimli` version. It also includes a change to the `compiler-builtins` dependency that helps with [1]. Changelog: https://github.com/gimli-rs/addr2line/blob/master/CHANGELOG.md#0250-20250611 [1]: #142265
2 parents 0d6ab20 + 68609e4 commit e8dfa76

File tree

3 files changed

+14
-18
lines changed

3 files changed

+14
-18
lines changed

library/Cargo.lock

Lines changed: 10 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,10 @@ version = 4
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.24.2"
7+
version = "0.25.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "dfbe277e56a376000877090da837660b4427aad530e3028d44e0bffe4f89a1c1"
9+
checksum = "9acbfca36652500c911ddb767ed433e3ed99b032b5d935be73c6923662db1d43"
1010
dependencies = [
11-
"compiler_builtins",
1211
"gimli",
1312
"rustc-std-workspace-alloc",
1413
"rustc-std-workspace-core",
@@ -115,11 +114,10 @@ dependencies = [
115114

116115
[[package]]
117116
name = "gimli"
118-
version = "0.31.1"
117+
version = "0.32.0"
119118
source = "registry+https://github.com/rust-lang/crates.io-index"
120-
checksum = "07e28edb80900c19c28f1072f2e8aeca7fa06b23cd4169cefe1af5aa3260783f"
119+
checksum = "93563d740bc9ef04104f9ed6f86f1e3275c2cdafb95664e26584b9ca807a8ffe"
121120
dependencies = [
122-
"compiler_builtins",
123121
"rustc-std-workspace-alloc",
124122
"rustc-std-workspace-core",
125123
]
@@ -156,11 +154,10 @@ dependencies = [
156154

157155
[[package]]
158156
name = "memchr"
159-
version = "2.7.4"
157+
version = "2.7.5"
160158
source = "registry+https://github.com/rust-lang/crates.io-index"
161-
checksum = "78ca9ab1a0babb1e7d5695e3530886289c18cf2f87ec19a575a0abdce112e3a3"
159+
checksum = "32a282da65faaf38286cf3be983213fcf1d2e2a58700e808f83f4ea9a4804bc0"
162160
dependencies = [
163-
"compiler_builtins",
164161
"rustc-std-workspace-core",
165162
]
166163

@@ -178,11 +175,10 @@ dependencies = [
178175

179176
[[package]]
180177
name = "object"
181-
version = "0.36.7"
178+
version = "0.37.1"
182179
source = "registry+https://github.com/rust-lang/crates.io-index"
183-
checksum = "62948e14d923ea95ea2c7c86c71013138b66525b86bdc08d2dcc262bdb497b87"
180+
checksum = "03fd943161069e1768b4b3d050890ba48730e590f57e56d4aa04e7e090e61b4a"
184181
dependencies = [
185-
"compiler_builtins",
186182
"memchr",
187183
"rustc-std-workspace-alloc",
188184
"rustc-std-workspace-core",
@@ -402,9 +398,9 @@ dependencies = [
402398

403399
[[package]]
404400
name = "unwinding"
405-
version = "0.2.6"
401+
version = "0.2.7"
406402
source = "registry+https://github.com/rust-lang/crates.io-index"
407-
checksum = "8393f2782b6060a807337ff353780c1ca15206f9ba2424df18cb6e733bd7b345"
403+
checksum = "7d80f6c2bfede213d9a90b4a14f3eb99b84e33c52df6c1a15de0a100f5a88751"
408404
dependencies = [
409405
"compiler_builtins",
410406
"gimli",

library/std/Cargo.toml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,15 +32,15 @@ rustc-demangle = { version = "0.1.24", features = ['rustc-dep-of-std'] }
3232

3333
[target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]
3434
miniz_oxide = { version = "0.8.0", optional = true, default-features = false }
35-
addr2line = { version = "0.24.0", optional = true, default-features = false }
35+
addr2line = { version = "0.25.0", optional = true, default-features = false }
3636

3737
[target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
3838
libc = { version = "0.2.172", default-features = false, features = [
3939
'rustc-dep-of-std',
4040
], public = true }
4141

4242
[target.'cfg(all(not(target_os = "aix"), not(all(windows, target_env = "msvc", not(target_vendor = "uwp")))))'.dependencies]
43-
object = { version = "0.36.0", default-features = false, optional = true, features = [
43+
object = { version = "0.37.1", default-features = false, optional = true, features = [
4444
'read_core',
4545
'elf',
4646
'macho',
@@ -50,7 +50,7 @@ object = { version = "0.36.0", default-features = false, optional = true, featur
5050
] }
5151

5252
[target.'cfg(target_os = "aix")'.dependencies]
53-
object = { version = "0.36.0", default-features = false, optional = true, features = [
53+
object = { version = "0.37.1", default-features = false, optional = true, features = [
5454
'read_core',
5555
'xcoff',
5656
'unaligned',

library/unwind/Cargo.toml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@ cfg-if = "1.0"
2222
libc = { version = "0.2.140", features = ['rustc-dep-of-std'], default-features = false }
2323

2424
[target.'cfg(target_os = "xous")'.dependencies]
25-
unwinding = { version = "0.2.6", features = ['rustc-dep-of-std', 'unwinder', 'fde-custom'], default-features = false }
25+
unwinding = { version = "0.2.7", features = ['rustc-dep-of-std', 'unwinder', 'fde-custom'], default-features = false }
2626

2727
[features]
2828

0 commit comments

Comments
 (0)