Skip to content

Commit

Permalink
deps: Update zip to 1.3 (#839)
Browse files Browse the repository at this point in the history
  • Loading branch information
loewenheim authored May 22, 2024
1 parent e532563 commit ff0aee8
Show file tree
Hide file tree
Showing 3 changed files with 70 additions and 15 deletions.
77 changes: 66 additions & 11 deletions Cargo.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion symbolic-debuginfo/Cargo.toml
Original file line number Diff line number Diff line change
Expand Up @@ -103,7 +103,7 @@ symbolic-common = { version = "12.8.0", path = "../symbolic-common" }
symbolic-ppdb = { version = "12.8.0", path = "../symbolic-ppdb", optional = true }
thiserror = "1.0.39"
wasmparser = { version = "0.202.0", optional = true }
zip = { version = "0.6.4", optional = true, default-features = false, features = ["deflate"] }
zip = { version = "1.3.1", optional = true, default-features = false, features = ["deflate"] }

[dev-dependencies]
criterion = { version = "0.5.1", features = ["html_reports"] }
Expand Down
6 changes: 3 additions & 3 deletions symbolic-debuginfo/src/sourcebundle.rs
Original file line number Diff line number Diff line change
Expand Up @@ -55,7 +55,7 @@ use parking_lot::Mutex;
use regex::Regex;
use serde::{Deserialize, Deserializer, Serialize};
use thiserror::Error;
use zip::{write::FileOptions, ZipWriter};
use zip::{write::SimpleFileOptions, ZipWriter};

use symbolic_common::{Arch, AsSelf, CodeId, DebugId, SourceLinkMappings};

Expand Down Expand Up @@ -1072,14 +1072,14 @@ where
collect_il2cpp: bool,
}

fn default_file_options() -> FileOptions {
fn default_file_options() -> SimpleFileOptions {
// TODO: should we maybe acknowledge that its the year 2023 and switch to zstd eventually?
// Though it obviously needs to be supported across the whole platform,
// which does not seem to be the case for Python?

// Depending on `zip` crate feature flags, it might default to the current time.
// Using an explicit `DateTime::default` gives us a deterministic `1980-01-01T00:00:00`.
FileOptions::default().last_modified_time(zip::DateTime::default())
SimpleFileOptions::default().last_modified_time(zip::DateTime::default())
}

impl<W> SourceBundleWriter<W>
Expand Down

0 comments on commit ff0aee8

Please sign in to comment.