Skip to content

Commit

Permalink
Auto merge of rust-lang#125636 - workingjubilee:bump-backtrace-0.3.72…
Browse files Browse the repository at this point in the history
…, r=workingjubilee

Bump backtrace to 0.3.72

This removes a bunch of dead code, contains critical aarch64-windows fixes, some less-critical windows-in-general improvements, adds visionOS support (and probably improves support for a bunch of Apple platforms...), and harmonizes backtrace's dependencies with rustc/std's.

See rust-lang/backtrace-rs@0.3.71...0.3.72

r? `@ghost`
  • Loading branch information
bors committed May 28, 2024
2 parents d86e122 + 3ec9d8d commit c0d6003
Show file tree
Hide file tree
Showing 3 changed files with 29 additions and 9 deletions.
32 changes: 26 additions & 6 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,18 @@ name = "addr2line"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
dependencies = [
"gimli 0.28.1",
]

[[package]]
name = "addr2line"
version = "0.22.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "6e4503c46a5c0c7844e948c9a4d6acd9f50cccb4de1c48eb9e291ea17470c678"
dependencies = [
"compiler_builtins",
"gimli",
"gimli 0.29.0",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]
Expand Down Expand Up @@ -287,7 +296,7 @@ version = "0.3.71"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "26b05800d2e817c8b3b4b54abd461726265fa9789ae34330622f2db9ee696f9d"
dependencies = [
"addr2line",
"addr2line 0.21.0",
"cc",
"cfg-if",
"libc",
Expand Down Expand Up @@ -1575,6 +1584,17 @@ dependencies = [
"stable_deref_trait",
]

[[package]]
name = "gimli"
version = "0.29.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "40ecd4077b5ae9fd2e9e169b102c6c330d0605168eb0e8bf79952b256dbefffd"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]

[[package]]
name = "glob"
version = "0.3.1"
Expand Down Expand Up @@ -3234,7 +3254,7 @@ dependencies = [
name = "run_make_support"
version = "0.0.0"
dependencies = [
"gimli",
"gimli 0.28.1",
"object 0.34.0",
"regex",
"similar",
Expand Down Expand Up @@ -5130,7 +5150,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
name = "std"
version = "0.0.0"
dependencies = [
"addr2line",
"addr2line 0.22.0",
"alloc",
"cfg-if",
"compiler_builtins",
Expand Down Expand Up @@ -5409,7 +5429,7 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4db52ee8fec06e119b692ef3dd2c4cf621a99204c1b8c47407870ed050305b9b"
dependencies = [
"gimli",
"gimli 0.28.1",
"hashbrown",
"object 0.32.2",
"tracing",
Expand Down Expand Up @@ -5909,7 +5929,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "37a19a21a537f635c16c7576f22d0f2f7d63353c1337ad4ce0d8001c7952a25b"
dependencies = [
"compiler_builtins",
"gimli",
"gimli 0.28.1",
"rustc-std-workspace-core",
]

Expand Down
4 changes: 2 additions & 2 deletions library/std/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -24,11 +24,11 @@ hashbrown = { version = "0.14", default-features = false, features = ['rustc-dep
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }

# Dependencies of the `backtrace` crate
rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
rustc-demangle = { version = "0.1.24", features = ['rustc-dep-of-std'] }

[target.'cfg(not(all(windows, target_env = "msvc", not(target_vendor = "uwp"))))'.dependencies]
miniz_oxide = { version = "0.7.0", optional = true, default-features = false }
addr2line = { version = "0.21.0", optional = true, default-features = false }
addr2line = { version = "0.22.0", optional = true, default-features = false }

[target.'cfg(not(all(windows, target_env = "msvc")))'.dependencies]
libc = { version = "0.2.153", default-features = false, features = ['rustc-dep-of-std'], public = true }
Expand Down

0 comments on commit c0d6003

Please sign in to comment.