Skip to content

Commit

Permalink
Auto merge of rust-lang#115112 - tmandry:backtrace-0369, r=compiler-e…
Browse files Browse the repository at this point in the history
…rrors

Bump backtrace to 0.3.69
  • Loading branch information
bors committed Aug 23, 2023
2 parents 8e8231f + 4c14ca3 commit 249595b
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 38 deletions.
50 changes: 13 additions & 37 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -2,23 +2,14 @@
# It is not intended for manual editing.
version = 3

[[package]]
name = "addr2line"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
dependencies = [
"gimli 0.27.3",
]

[[package]]
name = "addr2line"
version = "0.21.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8a30b2e23b9e17a9f90641c7ab1549cd9b44f296d3ccbf309d2863cfe398a0cb"
dependencies = [
"compiler_builtins",
"gimli 0.28.0",
"gimli",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]
Expand Down Expand Up @@ -180,7 +171,7 @@ version = "0.1.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "9792d37ca5173d7e7f4fe453739a0671d0557915a030a383d6b866476bbc3e71"
dependencies = [
"object 0.32.0",
"object",
]

[[package]]
Expand Down Expand Up @@ -246,16 +237,16 @@ checksum = "d468802bab17cbc0cc575e9b053f41e72aa36bfa6b7f55e3529ffa43161b97fa"

[[package]]
name = "backtrace"
version = "0.3.68"
version = "0.3.69"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
checksum = "2089b7e3f35b9dd2d0ed921ead4f6d318c27680d4a5bd167b3ee120edb105837"
dependencies = [
"addr2line 0.20.0",
"addr2line",
"cc",
"cfg-if",
"libc",
"miniz_oxide",
"object 0.31.1",
"object",
"rustc-demangle",
]

Expand Down Expand Up @@ -1435,12 +1426,6 @@ dependencies = [
"wasi",
]

[[package]]
name = "gimli"
version = "0.27.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b6c80984affa11d98d1b88b66ac8853f143217b399d3c74116778ff8fdb4ed2e"

[[package]]
name = "gimli"
version = "0.28.0"
Expand Down Expand Up @@ -2430,15 +2415,6 @@ dependencies = [
"libc",
]

[[package]]
name = "object"
version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
dependencies = [
"memchr",
]

[[package]]
name = "object"
version = "0.32.0"
Expand Down Expand Up @@ -3357,7 +3333,7 @@ dependencies = [
"cstr",
"libc",
"measureme",
"object 0.32.0",
"object",
"rustc-demangle",
"rustc_ast",
"rustc_attr",
Expand Down Expand Up @@ -3393,7 +3369,7 @@ dependencies = [
"itertools",
"jobserver",
"libc",
"object 0.32.0",
"object",
"pathdiff",
"regex",
"rustc_arena",
Expand Down Expand Up @@ -4327,7 +4303,7 @@ name = "rustc_target"
version = "0.0.0"
dependencies = [
"bitflags 1.3.2",
"object 0.32.0",
"object",
"rustc_abi",
"rustc_data_structures",
"rustc_feature",
Expand Down Expand Up @@ -4856,7 +4832,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
name = "std"
version = "0.0.0"
dependencies = [
"addr2line 0.21.0",
"addr2line",
"alloc",
"cfg-if",
"compiler_builtins",
Expand All @@ -4867,7 +4843,7 @@ dependencies = [
"hermit-abi 0.3.2",
"libc",
"miniz_oxide",
"object 0.32.0",
"object",
"panic_abort",
"panic_unwind",
"profiler_builtins",
Expand Down Expand Up @@ -5171,9 +5147,9 @@ version = "0.7.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4db52ee8fec06e119b692ef3dd2c4cf621a99204c1b8c47407870ed050305b9b"
dependencies = [
"gimli 0.28.0",
"gimli",
"hashbrown 0.14.0",
"object 0.32.0",
"object",
"tracing",
]

Expand Down

0 comments on commit 249595b

Please sign in to comment.