diff --git a/Cargo.lock b/Cargo.lock index 5e7fb276a6..a861f7136e 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -39,18 +39,6 @@ dependencies = [ "version_check", ] -[[package]] -name = "ahash" -version = "0.8.12" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5a15f179cd60c4584b8a8c596927aadc462e27f2ca70c04e0071964a73ba7a75" -dependencies = [ - "cfg-if", - "once_cell", - "version_check", - "zerocopy", -] - [[package]] name = "aho-corasick" version = "1.1.3" @@ -1083,12 +1071,13 @@ checksum = "1ced73b1dacfc750a6db6c0a0c3a3853c8b41997e2e2c563dc90804ae6867959" [[package]] name = "flate2" -version = "1.1.2" +version = "1.1.9" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "4a3d7db9596fecd151c5f638c0ee5d5bd487b6e0ea232e5dc96d5250f6f94b1d" +checksum = "843fba2746e448b37e26a819579957415c8cef339bf08564fe8b7ddbd959573c" dependencies = [ "crc32fast", "miniz_oxide", + "zlib-rs", ] [[package]] @@ -1097,6 +1086,12 @@ version = "1.0.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "3f9eec918d3f24069decb9af1554cad7c880e2da24a9afd88aca000531ab82c1" +[[package]] +name = "foldhash" +version = "0.1.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d9c4f5dac5e15c24eb999c26181a6ca40b39fe946cbe4c263c7209467bc83af2" + [[package]] name = "foldhash" version = "0.2.0" @@ -1320,13 +1315,12 @@ dependencies = [ [[package]] name = "goblin" -version = "0.8.2" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "1b363a30c165f666402fe6a3024d3bec7ebc898f96a4a23bd1c99f8dbf3f4f47" +version = "0.10.5" +source = "git+https://github.com/supervacuus/goblin.git?branch=feat%2Fadd_parse_imports_pe_option#e4c10cced27d316394454d6bd2832818a16ee412" dependencies = [ "log", "plain", - "scroll 0.12.0", + "scroll 0.13.0", ] [[package]] @@ -1365,16 +1359,18 @@ version = "0.12.3" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8a9ee70c43aaf417c914396645a0fa852624801b24ebb7ae78fe8272889ac888" dependencies = [ - "ahash 0.7.8", + "ahash", ] [[package]] name = "hashbrown" -version = "0.14.5" +version = "0.15.5" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "e5274423e17b7c9fc20b6e7e208532f9b19825d82dfd615708b70edd83df41f1" +checksum = "9229cfe53dfd69f0609a49f65461bd93001ea1ef889cd5529dd176593f5338a1" dependencies = [ - "ahash 0.8.12", + "allocator-api2", + "equivalent", + "foldhash 0.1.5", "serde", ] @@ -1386,7 +1382,7 @@ checksum = "5419bdc4f6a9207fbeba6d11b604d481addf78ecd10c11ad51e76c2f6482748d" dependencies = [ "allocator-api2", "equivalent", - "foldhash", + "foldhash 0.2.0", ] [[package]] @@ -2137,6 +2133,7 @@ source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1fa76a2c86f704bdb222d66965fb3d63269ce38518b83cb0575fca855ebb6316" dependencies = [ "adler2", + "simd-adler32", ] [[package]] @@ -2832,7 +2829,7 @@ dependencies = [ "serde_json", "thiserror 1.0.69", "uuid", - "watto", + "watto 0.1.0", ] [[package]] @@ -3305,7 +3302,16 @@ version = "0.12.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "6ab8598aa408498679922eff7fa985c25d58a90771bd6be794434c5277eab1a6" dependencies = [ - "scroll_derive", + "scroll_derive 0.12.1", +] + +[[package]] +name = "scroll" +version = "0.13.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c1257cd4248b4132760d6524d6dda4e053bc648c9070b960929bf50cfb1e7add" +dependencies = [ + "scroll_derive 0.13.1", ] [[package]] @@ -3319,6 +3325,17 @@ dependencies = [ "syn", ] +[[package]] +name = "scroll_derive" +version = "0.13.1" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "ed76efe62313ab6610570951494bdaa81568026e0318eaa55f167de70eeea67d" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "sdd" version = "3.0.10" @@ -3484,7 +3501,7 @@ dependencies = [ "which", "whoami", "windows-sys 0.59.0", - "zip", + "zip 2.4.2", ] [[package]] @@ -3785,6 +3802,16 @@ dependencies = [ "der", ] +[[package]] +name = "srcsrv" +version = "0.2.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85cd3e3828fb4dd5ba0e7091777edb6c3db3cd2d6fc10547b29b40f6949a29be" +dependencies = [ + "memchr", + "thiserror 2.0.17", +] + [[package]] name = "stable_deref_trait" version = "1.2.0" @@ -3818,9 +3845,8 @@ checksum = "13c2bddecc57b384dee18652358fb23172facb8a2c51ccc10d74c157bdea3292" [[package]] name = "symbolic" -version = "12.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "39491f196401cfa42c44c12d18b6c2e4dc27f404b3adedc0b461dae049711886" +version = "12.17.3" +source = "git+https://github.com/getsentry/symbolic.git?branch=fix%2Fdisable_goblin_import_parser#cae0561d2ef81cc4d424f699daf69de37d53dac0" dependencies = [ "symbolic-common", "symbolic-debuginfo", @@ -3830,9 +3856,8 @@ dependencies = [ [[package]] name = "symbolic-common" -version = "12.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "d03f433c9befeea460a01d750e698aa86caf86dcfbd77d552885cd6c89d52f50" +version = "12.17.3" +source = "git+https://github.com/getsentry/symbolic.git?branch=fix%2Fdisable_goblin_import_parser#cae0561d2ef81cc4d424f699daf69de37d53dac0" dependencies = [ "debugid", "memmap2", @@ -3843,9 +3868,8 @@ dependencies = [ [[package]] name = "symbolic-debuginfo" -version = "12.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "503aacdde371090f23ba8c57a8f8d8cb2ba99370e8259d76f134a7d3e18b4458" +version = "12.17.3" +source = "git+https://github.com/getsentry/symbolic.git?branch=fix%2Fdisable_goblin_import_parser#cae0561d2ef81cc4d424f699daf69de37d53dac0" dependencies = [ "debugid", "elementtree", @@ -3854,30 +3878,29 @@ dependencies = [ "flate2", "gimli", "goblin", - "lazy_static", "nom", "nom-supreme", "once_cell", "parking_lot", "pdb-addr2line", "regex", - "scroll 0.12.0", + "scroll 0.13.0", "serde", "serde_json", "smallvec", + "srcsrv", "symbolic-common", "symbolic-ppdb", - "thiserror 1.0.69", + "thiserror 2.0.17", "wasmparser", - "zip", + "zip 7.2.0", "zstd", ] [[package]] name = "symbolic-il2cpp" -version = "12.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9a5b93b594f1b7085d1b60d0f013cca52bcb7cc2aaf72f7ca0a05153989b2d9d" +version = "12.17.3" +source = "git+https://github.com/getsentry/symbolic.git?branch=fix%2Fdisable_goblin_import_parser#cae0561d2ef81cc4d424f699daf69de37d53dac0" dependencies = [ "indexmap", "serde_json", @@ -3887,33 +3910,31 @@ dependencies = [ [[package]] name = "symbolic-ppdb" -version = "12.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "dde25496951966c75ca9ee9213bcdd853fe0db6a4cbcc8d0d097104a899c10df" +version = "12.17.3" +source = "git+https://github.com/getsentry/symbolic.git?branch=fix%2Fdisable_goblin_import_parser#cae0561d2ef81cc4d424f699daf69de37d53dac0" dependencies = [ "flate2", "indexmap", "serde", "serde_json", "symbolic-common", - "thiserror 1.0.69", + "thiserror 2.0.17", "uuid", - "watto", + "watto 0.2.0", ] [[package]] name = "symbolic-symcache" -version = "12.16.3" -source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "9884c1e755776d65646d5300736373fe20739432a673d648a68b7464a9bb2e9b" +version = "12.17.3" +source = "git+https://github.com/getsentry/symbolic.git?branch=fix%2Fdisable_goblin_import_parser#cae0561d2ef81cc4d424f699daf69de37d53dac0" dependencies = [ "indexmap", "symbolic-common", "symbolic-debuginfo", "symbolic-il2cpp", - "thiserror 1.0.69", + "thiserror 2.0.17", "tracing", - "watto", + "watto 0.2.0", ] [[package]] @@ -4273,6 +4294,12 @@ dependencies = [ "toml_edit", ] +[[package]] +name = "typed-path" +version = "0.12.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8e28f89b80c87b8fb0cf04ab448d5dd0dd0ade2f8891bae878de66a75a28600e" + [[package]] name = "typenum" version = "1.18.0" @@ -4523,13 +4550,12 @@ dependencies = [ [[package]] name = "wasmparser" -version = "0.214.0" +version = "0.243.0" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "5309c1090e3e84dad0d382f42064e9933fdaedb87e468cc239f0eabea73ddcb6" +checksum = "f6d8db401b0528ec316dfbe579e6ab4152d61739cfe076706d2009127970159d" dependencies = [ - "ahash 0.8.12", "bitflags 2.9.4", - "hashbrown 0.14.5", + "hashbrown 0.15.5", "indexmap", "semver", "serde", @@ -4545,6 +4571,17 @@ dependencies = [ "thiserror 1.0.69", ] +[[package]] +name = "watto" +version = "0.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "bfbc1480663d640f8c9f7a1ac70922eea60ac16fea79df883177df3bc7bb8b49" +dependencies = [ + "hashbrown 0.15.5", + "leb128", + "thiserror 2.0.17", +] + [[package]] name = "web-sys" version = "0.3.89" @@ -5178,6 +5215,26 @@ dependencies = [ "zstd", ] +[[package]] +name = "zip" +version = "7.2.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "c42e33efc22a0650c311c2ef19115ce232583abbe80850bc8b66509ebef02de0" +dependencies = [ + "crc32fast", + "flate2", + "indexmap", + "memchr", + "typed-path", + "zopfli", +] + +[[package]] +name = "zlib-rs" +version = "0.6.3" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3be3d40e40a133f9c916ee3f9f4fa2d9d63435b5fbe1bfc6d9dae0aa0ada1513" + [[package]] name = "zopfli" version = "0.8.2" diff --git a/Cargo.toml b/Cargo.toml index 9836bdc9e0..afb5ac8bec 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -146,3 +146,7 @@ strip = "debuginfo" # Only strip debuginfo (not symbols) to keep backtraces usef codegen-units = 1 # Parallel compilation prevents some optimizations. # We do not enable link-time optimizations (lto) because they cause the # CLI to timeout when run in Xcode Cloud. + +[patch.crates-io] +goblin = { git = "https://github.com/supervacuus/goblin.git", branch = "feat/add_parse_imports_pe_option" } +symbolic = { git = "https://github.com/getsentry/symbolic.git", branch = "fix/disable_goblin_import_parser" }