Skip to content

Commit

Permalink
Update the backtrace crate in libstd
Browse files Browse the repository at this point in the history
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
  • Loading branch information
alexcrichton committed Aug 19, 2021
1 parent 3d0774d commit 4a3e736
Show file tree
Hide file tree
Showing 4 changed files with 20 additions and 24 deletions.
36 changes: 16 additions & 20 deletions Cargo.lock
Expand Up @@ -4,9 +4,9 @@ version = 3

[[package]]
name = "addr2line"
version = "0.14.0"
version = "0.16.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "7c0929d69e78dd9bf5408269919fcbcaeb2e35e5d43e5815517cdc6a8e11a423"
checksum = "3e61f2b7f93d2c7d2b08263acaa4a363b3e276806c68af6134c44f523bf1aacd"
dependencies = [
"compiler_builtins",
"gimli",
Expand Down Expand Up @@ -1418,9 +1418,9 @@ dependencies = [

[[package]]
name = "gimli"
version = "0.23.0"
version = "0.25.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6503fe142514ca4799d4c26297c4248239fe8838d827db6bd6065c6ed29a6ce"
checksum = "f0a01e0497841a3b2db4f8afa483cce65f7e96a3498bd6c541734792aeac8fe7"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-alloc",
Expand Down Expand Up @@ -2141,9 +2141,13 @@ dependencies = [

[[package]]
name = "memchr"
version = "2.4.0"
version = "2.4.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b16bd47d9e329435e309c58469fe0791c2d0d1ba96ec0954152a5ae2b04387dc"
checksum = "308cc39be01b73d0d18f82a0e7b2a3df85245f84af96fdddc5d202d27e47b86a"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-core",
]

[[package]]
name = "memmap2"
Expand Down Expand Up @@ -2293,24 +2297,16 @@ dependencies = [

[[package]]
name = "object"
version = "0.22.0"
version = "0.26.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8d3b63360ec3cb337817c2dbd47ab4a0f170d285d8e5a2064600f3def1402397"
checksum = "ee2766204889d09937d00bfbb7fec56bb2a199e2ade963cab19185d8a6104c7c"
dependencies = [
"compiler_builtins",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]

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

[[package]]
Expand Down Expand Up @@ -3647,7 +3643,7 @@ dependencies = [
"itertools 0.9.0",
"jobserver",
"libc",
"object 0.25.2",
"object",
"pathdiff",
"regex",
"rustc_apfloat",
Expand Down Expand Up @@ -4840,7 +4836,7 @@ dependencies = [
"hermit-abi",
"libc",
"miniz_oxide",
"object 0.22.0",
"object",
"panic_abort",
"panic_unwind",
"profiler_builtins",
Expand Down
2 changes: 1 addition & 1 deletion compiler/rustc_codegen_ssa/Cargo.toml
Expand Up @@ -36,6 +36,6 @@ rustc_target = { path = "../rustc_target" }
rustc_session = { path = "../rustc_session" }

[dependencies.object]
version = "0.25.2"
version = "0.26.1"
default-features = false
features = ["read_core", "elf", "macho", "pe", "unaligned", "archive", "write"]
4 changes: 2 additions & 2 deletions library/std/Cargo.toml
Expand Up @@ -23,11 +23,11 @@ hashbrown = { version = "0.11", 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
addr2line = { version = "0.14.0", optional = true, default-features = false }
addr2line = { version = "0.16.0", optional = true, default-features = false }
rustc-demangle = { version = "0.1.18", features = ['rustc-dep-of-std'] }
miniz_oxide = { version = "0.4.0", optional = true, default-features = false }
[dependencies.object]
version = "0.22"
version = "0.26.1"
optional = true
default-features = false
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
Expand Down

0 comments on commit 4a3e736

Please sign in to comment.