Skip to content

Commit

Permalink
Update std to backtrace 0.3.68
Browse files Browse the repository at this point in the history 
Dedup addr2line, miniz_oxide, object in .lock
  • Loading branch information
@workingjubilee
workingjubilee committed Jul 3, 2023
1 parent 839e9a6 commit 079949d
Show file tree
Hide file tree
Showing 3 changed files with 23 additions and 50 deletions.
65 changes: 19 additions & 46 deletions Cargo.lock
View file
Original file line number Diff line number Diff line change
Expand Up @@ -4,25 +4,16 @@ version = 3

[[package]]
name = "addr2line"
version = "0.19.0"
version = "0.20.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "a76fd60b23679b7d19bd066031410fb7e458ccc5e958eb5c325888ce4baedc97"
checksum = "f4fa78e18c64fce05e902adecd7a5eed15a5e0a3439f7b0e169f0252214865e3"
dependencies = [
"compiler_builtins",
"gimli 0.27.3",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]

[[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 = "adler"
version = "1.0.2"
Expand Down Expand Up @@ -188,7 +179,7 @@ version = "0.1.4"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "74cfb39880a59e122232cb5fb06b20b4382d58c12fa9747d16f846d38a7b094c"
dependencies = [
"object 0.31.1",
"object",
]

[[package]]
Expand Down Expand Up @@ -258,12 +249,12 @@ version = "0.3.68"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "4319208da049c43661739c5fade2ba182f09d1dc2299b32298d3a31692b17e12"
dependencies = [
"addr2line 0.20.0",
"addr2line",
"cc",
"cfg-if",
"libc",
"miniz_oxide 0.7.1",
"object 0.31.1",
"miniz_oxide",
"object",
"rustc-demangle",
]

Expand Down Expand Up @@ -1190,7 +1181,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "3b9429470923de8e8cbd4d2dc513535400b4b3fef0319fb5c4e1f520a7bef743"
dependencies = [
"crc32fast",
"miniz_oxide 0.7.1",
"miniz_oxide",
]

[[package]]
Expand Down Expand Up @@ -2153,25 +2144,16 @@ checksum = "68354c5c6bd36d73ff3feceb05efa59b6acb7626617f4962be322a825e61f79a"

[[package]]
name = "miniz_oxide"
version = "0.6.2"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "b275950c28b37e794e8c55d88aeb5e139d0ce23fdbbeda68f8d7174abdf9e8fa"
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
"compiler_builtins",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
]

[[package]]
name = "miniz_oxide"
version = "0.7.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "e7810e0be55b428ada41041c41f32c9f1a42817901b4ccf45fa3d4b6561e74c7"
dependencies = [
"adler",
]

[[package]]
name = "miow"
version = "0.5.0"
Expand Down Expand Up @@ -2266,29 +2248,20 @@ dependencies = [
"libc",
]

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

[[package]]
name = "object"
version = "0.31.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "8bda667d9f2b5051b8833f59f3bf748b28ef54f850f4fcb389a252aa383866d1"
dependencies = [
"compiler_builtins",
"crc32fast",
"flate2",
"hashbrown 0.13.2",
"indexmap 1.9.3",
"memchr",
"rustc-std-workspace-alloc",
"rustc-std-workspace-core",
"ruzstd",
]

Expand Down Expand Up @@ -3115,7 +3088,7 @@ dependencies = [
"bitflags 1.3.2",
"libc",
"measureme",
"object 0.31.1",
"object",
"rustc-demangle",
"rustc_ast",
"rustc_attr",
Expand Down Expand Up @@ -3151,7 +3124,7 @@ dependencies = [
"itertools",
"jobserver",
"libc",
"object 0.31.1",
"object",
"pathdiff",
"regex",
"rustc_arena",
Expand Down Expand Up @@ -4082,7 +4055,7 @@ name = "rustc_target"
version = "0.0.0"
dependencies = [
"bitflags 1.3.2",
"object 0.31.1",
"object",
"rustc_abi",
"rustc_data_structures",
"rustc_feature",
Expand Down Expand Up @@ -4578,7 +4551,7 @@ checksum = "a2eb9349b6444b326872e140eb1cf5e7c522154d69e7a0ffb0fb81c06b37543f"
name = "std"
version = "0.0.0"
dependencies = [
"addr2line 0.19.0",
"addr2line",
"alloc",
"cfg-if",
"compiler_builtins",
Expand All @@ -4588,8 +4561,8 @@ dependencies = [
"hashbrown 0.14.0",
"hermit-abi 0.3.1",
"libc",
"miniz_oxide 0.6.2",
"object 0.30.4",
"miniz_oxide",
"object",
"panic_abort",
"panic_unwind",
"profiler_builtins",
Expand Down Expand Up @@ -4861,7 +4834,7 @@ checksum = "98c040e1340b889d4180c64e1d787efa9c32cb1617757e101480b61238b0d927"
dependencies = [
"gimli 0.26.2",
"hashbrown 0.12.3",
"object 0.31.1",
"object",
"tracing",
]

Expand Down
2 changes: 1 addition & 1 deletion library/backtrace
Submodule backtrace updated 23 files
+1 −1 .github/workflows/main.yml
+5 −5 Cargo.toml
+9 −18 ci/android-ndk.sh
+3 −3 ci/docker/aarch64-linux-android/Dockerfile
+3 −3 ci/docker/arm-linux-androideabi/Dockerfile
+3 −3 ci/docker/armv7-linux-androideabi/Dockerfile
+3 −3 ci/docker/i686-linux-android/Dockerfile
+3 −3 ci/docker/x86_64-linux-android/Dockerfile
+5 −5 crates/as-if-std/Cargo.toml
+2 −1 crates/as-if-std/src/lib.rs
+1 −1 src/backtrace/libunwind.rs
+1 −0 src/backtrace/mod.rs
+19 −5 src/dbghelp.rs
+0 −1 src/lib.rs
+17 −0 src/print.rs
+60 −13 src/symbolize/gimli.rs
+12 −2 src/symbolize/gimli/coff.rs
+82 −10 src/symbolize/gimli/elf.rs
+13 −4 src/symbolize/gimli/macho.rs
+6 −1 src/symbolize/gimli/mmap_unix.rs
+8 −18 src/symbolize/gimli/parse_running_mmaps_unix.rs
+10 −12 src/symbolize/gimli/stash.rs
+2 −5 tests/current-exe-mismatch.rs
6 changes: 3 additions & 3 deletions library/std/Cargo.toml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -26,11 +26,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
addr2line = { version = "0.19.0", optional = true, default-features = false }
addr2line = { version = "0.20.0", optional = true, default-features = false }
rustc-demangle = { version = "0.1.21", features = ['rustc-dep-of-std'] }
miniz_oxide = { version = "0.6.0", optional = true, default-features = false, public = false }
miniz_oxide = { version = "0.7.0", optional = true, default-features = false, public = false }
[dependencies.object]
version = "0.30.0"
version = "0.31.1"
optional = true
default-features = false
features = ['read_core', 'elf', 'macho', 'pe', 'unaligned', 'archive']
Expand Down

0 comments on commit 079949d

Please sign in to comment.