Skip to content

Bump zip from 0.6.6 to 2.1.3 #2227

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
glandium wants to merge 1 commit into
base: main
Choose a base branch
from
Open

Bump zip from 0.6.6 to 2.1.3 #2227

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
66 changes: 49 additions & 17 deletions Cargo.lock
View file
Open in desktop

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

2 changes: 1 addition & 1 deletion Cargo.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -102,7 +102,7 @@ uuid = { version = "1.9", features = ["v4"] }
walkdir = "2"
# by default which pulls in an outdated failure version
which = { version = "6", default-features = false }
zip = { version = "0.6", default-features = false }
zip = { version = "2", default-features = false }
zstd = "0.13"

# dist-server only
Expand Down
4 changes: 2 additions & 2 deletions src/cache/cache.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -281,7 +281,7 @@ impl CacheWrite {
{
// We're going to declare the compression method as "stored",
// but we're actually going to store zstd-compressed blobs.
let opts = FileOptions::default().compression_method(CompressionMethod::Stored);
let opts = FileOptions::<()>::default().compression_method(CompressionMethod::Stored);
let opts = if let Some(mode) = mode {
opts.unix_permissions(mode)
} else {
Expand Down Expand Up @@ -312,7 +312,7 @@ impl CacheWrite {

/// Finish writing data to the cache entry writer, and return the data.
pub fn finish(self) -> Result<Vec<u8>> {
let CacheWrite { mut zip } = self;
let CacheWrite { zip } = self;
let cur = zip.finish().context("Failed to finish cache entry zip")?;
Ok(cur.into_inner())
}
Expand Down