Skip to content

Commit

Permalink
Auto merge of rust-lang#126110 - workingjubilee:backtrace-0.3.73, r=w…
Browse files Browse the repository at this point in the history
…orkingjubilee

Update backtrace to 0.3.73

Fixes rust-lang#126109

r? `@ghost`
  • Loading branch information
bors committed Jun 7, 2024
2 parents 1be24d7 + 49c2a1d commit e3c3ce6
Show file tree
Hide file tree
Showing 3 changed files with 16 additions and 7 deletions.
17 changes: 13 additions & 4 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2652,14 +2652,11 @@ version = "0.32.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a6a622008b6e321afc04970976f62ee297fdbaa6f95318ca343e3eebb9648441"
dependencies = [
"compiler_builtins",
"crc32fast",
"flate2",
"hashbrown",
"indexmap",
"memchr",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
"ruzstd 0.5.0",
"wasmparser",
]
Expand All @@ -2675,6 +2672,18 @@ dependencies = [
"ruzstd 0.6.0",
]

[[package]]
name = "object"
version = "0.36.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "576dfe1fc8f9df304abb159d767a29d0476f7750fbf8aa7ad07816004a207434"
dependencies = [
"compiler_builtins",
"memchr",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]

[[package]]
name = "odht"
version = "0.3.1"
Expand Down Expand Up @@ -5357,7 +5366,7 @@ dependencies = [
"hermit-abi",
"libc",
"miniz_oxide",
"object 0.32.2",
"object 0.36.0",
"panic_abort",
"panic_unwind",
"profiler_builtins",
Expand Down
4 changes: 2 additions & 2 deletions library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -34,10 +34,10 @@ addr2line = { version = "0.22.0", optional = true, default-features = false }
libc = { version = "0.2.153", default-features = false, features = ['rustc-dep-of-std'], public = true }

[target.'cfg(all(not(target_os = "aix"), not(all(windows, target_env = "msvc", not(target_vendor = "uwp")))))'.dependencies]
object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] }
object = { version = "0.36.0", default-features = false, optional = true, features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive'] }

[target.'cfg(target_os = "aix")'.dependencies]
object = { version = "0.32.0", default-features = false, optional = true, features = ['read_core', 'xcoff', 'unaligned', 'archive'] }
object = { version = "0.36.0", default-features = false, optional = true, features = ['read_core', 'xcoff', 'unaligned', 'archive'] }

[dev-dependencies]
rand = { version = "0.8.5", default-features = false, features = ["alloc"] }
Expand Down

0 comments on commit e3c3ce6

Please sign in to comment.