Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
130 changes: 60 additions & 70 deletions Cargo.lock
Original file line number Diff line number Diff line change
Expand Up @@ -135,15 +135,6 @@ dependencies = [
"uuid",
]

[[package]]
name = "arbitrary"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c3d036a3c4ab069c7b410a2ce876bd74808d2d0888a82667669f8e783a898bf1"
dependencies = [
"derive_arbitrary",
]

[[package]]
name = "arrayvec"
version = "0.7.6"
Expand Down Expand Up @@ -1344,17 +1335,6 @@ dependencies = [
"powerfmt",
]

[[package]]
name = "derive_arbitrary"
version = "1.4.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "1e567bd82dcff979e4b03460c307b3cdc9e96fde3d73bed1496d2bc75d9dd62a"
dependencies = [
"proc-macro2",
"quote",
"syn 2.0.106",
]

[[package]]
name = "digest"
version = "0.10.7"
Expand Down Expand Up @@ -1894,7 +1874,6 @@ dependencies = [
"allocator-api2",
"equivalent",
"foldhash 0.1.5",
"serde",
]

[[package]]
Expand All @@ -1906,6 +1885,17 @@ dependencies = [
"foldhash 0.2.0",
]

[[package]]
name = "hashbrown"
version = "0.17.1"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "ed5909b6e89a2db4456e54cd5f673791d7eca6732202bbf2a9cc504fe2f9b84a"
dependencies = [
"foldhash 0.2.0",
"serde",
"serde_core",
]

[[package]]
name = "heck"
version = "0.5.0"
Expand Down Expand Up @@ -2336,13 +2326,14 @@ checksum = "0cfe9645a18782869361d9c8732246be7b410ad4e919d3609ebabdac00ba12c3"

[[package]]
name = "indexmap"
version = "2.11.1"
version = "2.14.2"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "206a8042aec68fa4a62e8d3f7aa4ceb508177d9324faf261e1959e495b7a1921"
checksum = "cc4e190f5d26ca7051642629da2c52fc03bde85a03197c99408dcd291734c855"
dependencies = [
"equivalent",
"hashbrown 0.15.5",
"hashbrown 0.17.1",
"serde",
"serde_core",
]

[[package]]
Expand Down Expand Up @@ -2422,7 +2413,7 @@ checksum = "e04d7f318608d35d4b61ddd75cbdaee86b023ebe2bd5a66ee0915f0bf93095a9"
dependencies = [
"hermit-abi",
"libc",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]

[[package]]
Expand Down Expand Up @@ -2820,7 +2811,7 @@ dependencies = [
"mach2",
"memmap2",
"minidump-common 0.26.1",
"nix",
"nix 0.30.1",
"procfs-core",
"scroll 0.12.0",
"serde",
Expand Down Expand Up @@ -2978,6 +2969,18 @@ dependencies = [
"libc",
]

[[package]]
name = "nix"
version = "0.31.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "cf20d2fde8ff38632c426f1165ed7436270b44f199fc55284c38276f9db47c3d"
dependencies = [
"bitflags",
"cfg-if",
"cfg_aliases",
"libc",
]

[[package]]
name = "nom"
version = "7.1.3"
Expand Down Expand Up @@ -4526,7 +4529,7 @@ dependencies = [
"cfg-if",
"libc",
"psm",
"windows-sys 0.59.0",
"windows-sys 0.52.0",
]

[[package]]
Expand Down Expand Up @@ -4697,8 +4700,8 @@ dependencies = [

[[package]]
name = "symbolic"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"symbolic-cfi",
"symbolic-common",
Expand All @@ -4712,8 +4715,8 @@ dependencies = [

[[package]]
name = "symbolic-cfi"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"symbolic-common",
"symbolic-debuginfo",
Expand All @@ -4722,8 +4725,8 @@ dependencies = [

[[package]]
name = "symbolic-common"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"debugid",
"memmap2",
Expand All @@ -4734,8 +4737,8 @@ dependencies = [

[[package]]
name = "symbolic-debuginfo"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"debugid",
"elementtree",
Expand All @@ -4759,14 +4762,14 @@ dependencies = [
"symbolic-ppdb",
"thiserror 2.0.17",
"wasmparser",
"zip 7.2.0",
"zip",
"zstd",
]

[[package]]
name = "symbolic-demangle"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"bitflags",
"cc",
Expand All @@ -4779,8 +4782,8 @@ dependencies = [

[[package]]
name = "symbolic-il2cpp"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"indexmap",
"serde_json",
Expand All @@ -4790,8 +4793,8 @@ dependencies = [

[[package]]
name = "symbolic-ppdb"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"flate2",
"indexmap",
Expand All @@ -4805,8 +4808,8 @@ dependencies = [

[[package]]
name = "symbolic-sourcemapcache"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"itertools",
"js-source-scopes",
Expand All @@ -4819,8 +4822,8 @@ dependencies = [

[[package]]
name = "symbolic-symcache"
version = "14.0.0-alpha.3"
source = "git+https://github.com/getsentry/symbolic.git?rev=c18f2a5065b99af7b20d984b3f51cd66a858cca9#c18f2a5065b99af7b20d984b3f51cd66a858cca9"
version = "14.0.0-alpha.4"
source = "git+https://github.com/getsentry/symbolic.git?rev=b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33#b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33"
dependencies = [
"indexmap",
"symbolic-common",
Expand Down Expand Up @@ -5009,7 +5012,7 @@ dependencies = [
"tracing-subscriber",
"url",
"uuid",
"zip 5.1.0",
"zip",
"zstd",
]

Expand Down Expand Up @@ -5098,7 +5101,7 @@ dependencies = [
"url",
"urlencoding",
"walkdir",
"zip 5.1.0",
"zip",
]

[[package]]
Expand All @@ -5115,7 +5118,7 @@ dependencies = [
"serde_json",
"symbolic",
"walkdir",
"zip 5.1.0",
"zip",
"zstd",
]

Expand Down Expand Up @@ -5960,12 +5963,12 @@ dependencies = [

[[package]]
name = "wasmparser"
version = "0.243.0"
version = "0.262.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "f6d8db401b0528ec316dfbe579e6ab4152d61739cfe076706d2009127970159d"
checksum = "974d643b125b272607e2fff8012ea14a8328acd7621e4bafa7afb32500052b1b"
dependencies = [
"bitflags",
"hashbrown 0.15.5",
"hashbrown 0.17.1",
"indexmap",
"semver",
"serde",
Expand Down Expand Up @@ -6519,29 +6522,16 @@ dependencies = [

[[package]]
name = "zip"
version = "5.1.0"
version = "9.0.5"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "014d9123d252f20eb6e9cfd9c1cbbcd84fe2409a67c4a0b5b7cc36593d18566d"
checksum = "6e04976da629d3b04204ba8105b396a193af8ad2583b2c79bfb3ab8af580a11e"
dependencies = [
"arbitrary",
"bzip2",
"crc32fast",
"flate2",
"indexmap",
"memchr",
"zopfli",
]

[[package]]
name = "zip"
version = "7.2.0"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "c42e33efc22a0650c311c2ef19115ce232583abbe80850bc8b66509ebef02de0"
dependencies = [
"crc32fast",
"flate2",
"indexmap",
"memchr",
"nix 0.31.3",
"typed-path",
"zopfli",
]
Expand All @@ -6554,9 +6544,9 @@ checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513"

[[package]]
name = "zopfli"
version = "0.8.2"
version = "0.8.3"
source = "registry+https://github.com/rust-lang/crates.io-index"
checksum = "edfc5ee405f504cd4984ecc6f14d02d55cfda60fa4b689434ef4102aae150cd7"
checksum = "f05cd8797d63865425ff89b5c4a48804f35ba0ce8d125800027ad6017d2b5249"
dependencies = [
"bumpalo",
"crc32fast",
Expand Down
4 changes: 2 additions & 2 deletions Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -133,7 +133,7 @@ serde_yaml = "0.9.14"
sha-1 = "0.10.0"
sha2 = "0.10.6"
sketches-ddsketch = "0.3.0"
symbolic = { git = "https://github.com/getsentry/symbolic.git", rev = "c18f2a5065b99af7b20d984b3f51cd66a858cca9" }
symbolic = { git = "https://github.com/getsentry/symbolic.git", rev = "b4571fb2ba0fb3244edd0ed4e27fb7eff7475d33" }
symbolicator-crash = { path = "crates/symbolicator-crash" }
symbolicator-js = { path = "crates/symbolicator-js" }
symbolicator-native = { path = "crates/symbolicator-native" }
Expand All @@ -159,5 +159,5 @@ urlencoding = "2.1.3"
uuid = { version = "1.0.0", features = ["v4", "serde"] }
walkdir = "2.3.1"
wasmbin = { version = "0.8.1", features = ["exception-handling"] }
zip = { version = "5.1.0", default-features = false, features = ["deflate"] }
zip = { version = "9.0.0", default-features = false, features = ["deflate"] }
zstd = "0.13.0"
2 changes: 1 addition & 1 deletion crates/symsorter/src/app.rs
Original file line number Diff line number Diff line change
Expand Up @@ -196,7 +196,7 @@ fn process_zip_archive(
let mut zip = ZipArchive::new(io::Cursor::new(bv))?;
for index in 0..zip.len() {
let zip_file = zip.by_index(index)?;
let name = zip_file.name().rsplit('/').next().unwrap().to_string();
let name = zip_file.name()?.rsplit('/').next().unwrap().to_string();

Copy link
Copy Markdown
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

The one code change that was necessary.

let bv = ByteView::read(zip_file)?;
if Archive::peek(&bv) != FileFormat::Unknown {
debug_ids.lock().unwrap().extend(
Expand Down
Loading