Skip to content

Commit 7960030

Browse files
committed
Auto merge of #88151 - alexcrichton:update-backtrace, r=Mark-Simulacrum
Update the backtrace crate in libstd This commit updates the backtrace crate in libstd now that dependencies have been updated to use `memchr` from the standard library as well. This is mostly just making sure deps are up-to-date and have all the latest-and-greatest fixes and such. Closes rust-lang/backtrace-rs#432
2 parents 2451f42 + 4a3e736 commit 7960030

File tree

4 files changed

+20
-24
lines changed

4 files changed

+20
-24
lines changed

Cargo.lock

+16-20
Original file line numberDiff line numberDiff line change
@@ -4,9 +4,9 @@ version = 3
44

55
[[package]]
66
name = "addr2line"
7-
version = "0.14.0"
7+
version = "0.16.0"
88
source = "registry+https://github.com/rust-lang/crates.io-index"
9-
checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
9+
checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
1010
dependencies = [
1111
"compiler_builtins",
1212
"gimli",
@@ -1418,9 +1418,9 @@ dependencies = [
14181418

14191419
[[package]]
14201420
name = "gimli"
1421-
version = "0.23.0"
1421+
version = "0.25.0"
14221422
source = "registry+https://github.com/rust-lang/crates.io-index"
1423-
checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
1423+
checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
14241424
dependencies = [
14251425
"compiler_builtins",
14261426
"rustc-std-workspace-alloc",
@@ -2141,9 +2141,13 @@ dependencies = [
21412141

21422142
[[package]]
21432143
name = "memchr"
2144-
version = "2.4.0"
2144+
version = "2.4.1"
21452145
source = "registry+https://github.com/rust-lang/crates.io-index"
2146-
checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
2146+
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
2147+
dependencies = [
2148+
"compiler_builtins",
2149+
"rustc-std-workspace-core",
2150+
]
21472151

21482152
[[package]]
21492153
name = "memmap2"
@@ -2293,24 +2297,16 @@ dependencies = [
22932297

22942298
[[package]]
22952299
name = "object"
2296-
version = "0.22.0"
2300+
version = "0.26.1"
22972301
source = "registry+https://github.com/rust-lang/crates.io-index"
2298-
checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
2302+
checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c"
22992303
dependencies = [
23002304
"compiler_builtins",
2301-
"rustc-std-workspace-alloc",
2302-
"rustc-std-workspace-core",
2303-
]
2304-
2305-
[[package]]
2306-
name = "object"
2307-
version = "0.25.2"
2308-
source = "registry+https://github.com/rust-lang/crates.io-index"
2309-
checksum = "f8bc1d42047cf336f0f939c99e97183cf31551bf0f2865a2ec9c8d91fd4ffb5e"
2310-
dependencies = [
23112305
"crc32fast",
23122306
"indexmap",
23132307
"memchr",
2308+
"rustc-std-workspace-alloc",
2309+
"rustc-std-workspace-core",
23142310
]
23152311

23162312
[[package]]
@@ -3647,7 +3643,7 @@ dependencies = [
36473643
"itertools 0.9.0",
36483644
"jobserver",
36493645
"libc",
3650-
"object 0.25.2",
3646+
"object",
36513647
"pathdiff",
36523648
"regex",
36533649
"rustc_apfloat",
@@ -4840,7 +4836,7 @@ dependencies = [
48404836
"hermit-abi",
48414837
"libc",
48424838
"miniz_oxide",
4843-
"object 0.22.0",
4839+
"object",
48444840
"panic_abort",
48454841
"panic_unwind",
48464842
"profiler_builtins",

compiler/rustc_codegen_ssa/Cargo.toml

+1-1
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,6 @@ rustc_target = { path = "../rustc_target" }
3636
rustc_session = { path = "../rustc_session" }
3737

3838
[dependencies.object]
39-
version = "0.25.2"
39+
version = "0.26.1"
4040
default-features = false
4141
features = ["read_core", "elf", "macho", "pe", "unaligned", "archive", "write"]

library/std/Cargo.toml

+2-2
Original file line numberDiff line numberDiff line change
@@ -23,11 +23,11 @@ hashbrown = { version = "0.11", default-features = false, features = ['rustc-dep
2323
std_detect = { path = "../stdarch/crates/std_detect", default-features = false, features = ['rustc-dep-of-std'] }
2424

2525
# Dependencies of the `backtrace` crate
26-
addr2line = { version = "0.14.0", optional = true, default-features = false }
26+
addr2line = { version = "0.16.0", optional = true, default-features = false }
2727
rustc-demangle = { version = "0.1.18", features = ['rustc-dep-of-std'] }
2828
miniz_oxide = { version = "0.4.0", optional = true, default-features = false }
2929
[dependencies.object]
30-
version = "0.22"
30+
version = "0.26.1"
3131
optional = true
3232
default-features = false
3333
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']

0 commit comments

Comments
 (0)