Auto merge of rust-lang#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
rust-lang-ci · Aug 19, 2021 · 7960030 · 7960030
2 parents 2451f42 + 4a3e736
commit 7960030
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 24 deletions.
diff --git a/Cargo.lock b/Cargo.lock
@@ -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",
@@ -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",
@@ -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"
@@ -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]]
@@ -3647,7 +3643,7 @@ dependencies = [
  "itertools 0.9.0",
  "jobserver",
  "libc",
- "object 0.25.2",
+ "object",
  "pathdiff",
  "regex",
  "rustc_apfloat",
@@ -4840,7 +4836,7 @@ dependencies = [
  "hermit-abi",
  "libc",
  "miniz_oxide",
- "object 0.22.0",
+ "object",
  "panic_abort",
  "panic_unwind",
  "profiler_builtins",

diff --git a/compiler/rustc_codegen_ssa/Cargo.toml b/compiler/rustc_codegen_ssa/Cargo.toml
@@ -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"]
diff --git a/library/backtrace b/library/backtrace
diff --git a/library/std/Cargo.toml b/library/std/Cargo.toml
@@ -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']
+12 −21		.github/workflows/main.yml
+25 −29		Cargo.toml
+41 −0		build.rs
+29 −0		ci/debuglink-docker.sh
+75 −0		ci/debuglink.sh
+2 −1		ci/docker/x86_64-unknown-linux-gnu/Dockerfile
+5 −4		crates/as-if-std/Cargo.toml
+0 −27		crates/backtrace-sys/Cargo.toml
+0 −1		crates/backtrace-sys/LICENSE-APACHE
+0 −1		crates/backtrace-sys/LICENSE-MIT
+0 −168		crates/backtrace-sys/build.rs
+0 −58		crates/backtrace-sys/src/lib.rs
+0 −1		crates/backtrace-sys/src/libbacktrace
+7 −0		crates/debuglink/Cargo.toml
+34 −0		crates/debuglink/src/main.rs
+0 −0		src/android-api.c
+35 −0		src/capture.rs
+3 −21		src/dbghelp.rs
+46 −22		src/symbolize/gimli.rs
+11 −10		src/symbolize/gimli/coff.rs
+243 −8		src/symbolize/gimli/elf.rs
+2 −1		src/symbolize/gimli/libs_haiku.rs
+3 −3		src/symbolize/gimli/libs_macos.rs
+18 −17		src/symbolize/gimli/macho.rs
+20 −0		src/symbolize/gimli/stash.rs
+0 −460		src/symbolize/libbacktrace.rs
+1 −11		src/symbolize/mod.rs
+7 −7		tests/accuracy/main.rs
+17 −59		tests/smoke.rs