Skip to content

Commit 7cbbd14

Browse files
authored
Rollup merge of rust-lang#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]: rust-lang#142265
2 parents 5442843 + 9901c63 commit 7cbbd14

File tree

3 files changed

+12
-15
lines changed

3 files changed

+12
-15
lines changed

Cargo.lock

Lines changed: 8 additions & 11 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

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',

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)