ziglang/zig
260
6.0k
Fork
You've already forked zig
775

Zip.Entry.extractTo #35232

Merged
squeek502 merged 4 commits from l1yefeng/zig:master into master 2026年06月13日 00:30:18 +02:00
Contributor
Copy link

Migrated from https://github.com/ziglang/zig/pull/23991

Entry.extract_to writes output using a given writer instead of to a destination dir. extract now calls extract_to.

Example scenarios that this PR helps: listing zip entry filenames, reading the first entry into memory.

Migrated from https://github.com/ziglang/zig/pull/23991 `Entry.extract_to` writes output using a given writer instead of to a destination dir. `extract` now calls `extract_to`. Example scenarios that this PR helps: listing zip entry filenames, reading the first entry into memory.
lib/std/zip.zig Outdated
@ -466,3 +460,1 @@
)!void{
constio=stream.io;
pubfnget_filename(self:Entry,stream:*File.Reader,filename_buf:[]u8,options:ExtractOptions)![]u8{

Should be getFilename and extract_to should be extractTo: https://ziglang.org/documentation/master/#Names

Should be `getFilename` and `extract_to` should be `extractTo`: https://ziglang.org/documentation/master/#Names
Author
Contributor
Copy link

Renamed. Thanks.

Renamed. Thanks.
squeek502 marked this conversation as resolved
l1yefeng changed title from (削除) Zip.Entry.extract_to (削除ここまで) to Zip.Entry.extractTo 2026年05月06日 23:54:01 +02:00
squeek502 requested changes 2026年05月18日 06:55:15 +02:00
Dismissed
lib/std/zip.zig Outdated
@ -552,0 +563,4 @@
.store=>{
stream.interface.streamExact64(w,self.uncompressed_size)catch|err|switch(err){
error.ReadFailed=>returnstream.err.?,
error.WriteFailed=>returnerr,

In general, this pattern is preferred:

error.WriteFailed => |e| return e,

The |e| will narrow the returned error set (when that matters). See also this (the reasoning doesn't apply here, just another perk of that pattern).

In general, this pattern is preferred: ``` error.WriteFailed => |e| return e, ``` The `|e|` will narrow the returned error set (when that matters). [See also this](https://codeberg.org/ziglang/zig/pulls/31993) (the reasoning doesn't apply here, just another perk of that pattern).
squeek502 marked this conversation as resolved
lib/std/zip.zig Outdated
@ -552,0 +571,4 @@
varflate_buffer:[flate.max_window_len]u8=undefined;
vardecompress:flate.Decompress=.init(&stream.interface,.raw,&flate_buffer);
decompress.reader.streamExact64(w,self.uncompressed_size)catch|err|switch(err){
error.ReadFailed=>returnstream.err.?,

I realize this is not new/changed code, but:

  • this can lose error information from decompress.err since ReadFailed can occur from an invalid zip rather than from stream, which also means that
  • the .? is not correct since stream.err could be null when decompress.err is not

This makes more sense to me:

error.ReadFailed=>returndecompress.errorelsestream.err.?,
I realize this is not new/changed code, but: - this can lose error information from `decompress.err` since `ReadFailed` can occur from an invalid zip rather than from `stream`, which also means that - the `.?` is not correct since `stream.err` could be null when `decompress.err` is not This makes more sense to me: ```zig error.ReadFailed => return decompress.err orelse stream.err.?, ```
Author
Contributor
Copy link

Thank you for the suggestions.

I also replaced .? with orelse, because—though it may be true—it's not obvious that one of decompress's and stream's err is set when error occurs. The updated version looks safe and reasonable to me.

Thank you for the suggestions. I also replaced `.?` with `orelse`, because—though it may be true—it's _not obvious_ that one of `decompress`'s and `stream`'s `err` is set when error occurs. The updated version looks safe and reasonable to me.
squeek502 marked this conversation as resolved
l1yefeng force-pushed master from d7a7c26d28
All checks were successful
ci / x86_64-netbsd-release (pull_request) Successful in 34m43s
ci / x86_64-freebsd-release (pull_request) Successful in 36m45s
ci / x86_64-netbsd-debug (pull_request) Successful in 43m34s
ci / x86_64-windows-release (pull_request) Successful in 44m50s
ci / x86_64-openbsd-release (pull_request) Successful in 48m0s
ci / x86_64-freebsd-debug (pull_request) Successful in 48m44s
ci / x86_64-windows-debug (pull_request) Successful in 53m57s
ci / x86_64-openbsd-debug (pull_request) Successful in 55m31s
ci / aarch64-macos-release (pull_request) Successful in 59m38s
ci / x86_64-linux-debug (pull_request) Successful in 1h0m50s
ci / aarch64-macos-debug (pull_request) Successful in 1h7m14s
ci / aarch64-linux-release (pull_request) Successful in 1h33m23s
ci / x86_64-linux-debug-llvm (pull_request) Successful in 2h12m52s
ci / powerpc64le-linux-release (pull_request) Successful in 2h14m19s
ci / x86_64-linux-release (pull_request) Successful in 2h44m32s
ci / aarch64-linux-debug (pull_request) Successful in 2h46m33s
ci / powerpc64le-linux-debug (pull_request) Successful in 5h4m33s
ci / s390x-linux-release (pull_request) Successful in 1h49m38s
ci / s390x-linux-debug (pull_request) Successful in 3h1m38s
ci / riscv64-linux-debug (pull_request) Has been skipped
ci / riscv64-linux-release (pull_request) Has been skipped
ci / loongarch64-linux-release (pull_request) Successful in 1h57m55s
ci / loongarch64-linux-debug (pull_request) Successful in 3h27m5s
ci / aarch64-freebsd-debug (pull_request) Successful in 3h58m18s
ci / aarch64-freebsd-release (pull_request) Successful in 2h46m24s
ci / aarch64-netbsd-debug (pull_request) Successful in 3h44m52s
ci / aarch64-netbsd-release (pull_request) Successful in 3h10m59s
to a9f2cc2605
Some checks failed
ci / riscv64-linux-debug (pull_request) Has been skipped
ci / riscv64-linux-release (pull_request) Has been skipped
ci / x86_64-linux-release (pull_request) Failing after 10m1s
ci / x86_64-netbsd-release (pull_request) Failing after 13m53s
ci / x86_64-windows-release (pull_request) Failing after 18m24s
ci / x86_64-freebsd-debug (pull_request) Failing after 19m14s
ci / x86_64-netbsd-debug (pull_request) Failing after 19m32s
ci / x86_64-openbsd-release (pull_request) Failing after 21m21s
ci / s390x-linux-release (pull_request) Failing after 24m1s
ci / x86_64-linux-debug (pull_request) Failing after 24m34s
ci / x86_64-linux-debug-llvm (pull_request) Failing after 24m30s
ci / x86_64-freebsd-release (pull_request) Failing after 10m37s
ci / x86_64-windows-debug (pull_request) Failing after 24m48s
ci / x86_64-openbsd-debug (pull_request) Failing after 27m23s
ci / aarch64-macos-release (pull_request) Failing after 30m22s
ci / s390x-linux-debug (pull_request) Failing after 35m21s
ci / powerpc64le-linux-release (pull_request) Failing after 36m29s
ci / aarch64-macos-debug (pull_request) Failing after 37m50s
ci / aarch64-linux-release (pull_request) Failing after 43m13s
ci / powerpc64le-linux-debug (pull_request) Failing after 53m53s
ci / aarch64-linux-debug (pull_request) Failing after 1h5m7s
ci / loongarch64-linux-release (pull_request) Failing after 45m56s
ci / loongarch64-linux-debug (pull_request) Failing after 1h10m0s
ci / aarch64-freebsd-debug (pull_request) Has been cancelled
ci / aarch64-freebsd-release (pull_request) Has been cancelled
ci / aarch64-netbsd-debug (pull_request) Has been cancelled
ci / aarch64-netbsd-release (pull_request) Has been cancelled
2026年05月18日 23:44:17 +02:00 Compare
l1yefeng force-pushed master from a9f2cc2605
Some checks failed
ci / riscv64-linux-debug (pull_request) Has been skipped
ci / riscv64-linux-release (pull_request) Has been skipped
ci / x86_64-linux-release (pull_request) Failing after 10m1s
ci / x86_64-netbsd-release (pull_request) Failing after 13m53s
ci / x86_64-windows-release (pull_request) Failing after 18m24s
ci / x86_64-freebsd-debug (pull_request) Failing after 19m14s
ci / x86_64-netbsd-debug (pull_request) Failing after 19m32s
ci / x86_64-openbsd-release (pull_request) Failing after 21m21s
ci / s390x-linux-release (pull_request) Failing after 24m1s
ci / x86_64-linux-debug (pull_request) Failing after 24m34s
ci / x86_64-linux-debug-llvm (pull_request) Failing after 24m30s
ci / x86_64-freebsd-release (pull_request) Failing after 10m37s
ci / x86_64-windows-debug (pull_request) Failing after 24m48s
ci / x86_64-openbsd-debug (pull_request) Failing after 27m23s
ci / aarch64-macos-release (pull_request) Failing after 30m22s
ci / s390x-linux-debug (pull_request) Failing after 35m21s
ci / powerpc64le-linux-release (pull_request) Failing after 36m29s
ci / aarch64-macos-debug (pull_request) Failing after 37m50s
ci / aarch64-linux-release (pull_request) Failing after 43m13s
ci / powerpc64le-linux-debug (pull_request) Failing after 53m53s
ci / aarch64-linux-debug (pull_request) Failing after 1h5m7s
ci / loongarch64-linux-release (pull_request) Failing after 45m56s
ci / loongarch64-linux-debug (pull_request) Failing after 1h10m0s
ci / aarch64-freebsd-debug (pull_request) Has been cancelled
ci / aarch64-freebsd-release (pull_request) Has been cancelled
ci / aarch64-netbsd-debug (pull_request) Has been cancelled
ci / aarch64-netbsd-release (pull_request) Has been cancelled
to b45b739f3d
All checks were successful
ci / x86_64-openbsd-release (pull_request) Successful in 41m33s
ci / x86_64-freebsd-release (pull_request) Successful in 45m2s
ci / x86_64-freebsd-debug (pull_request) Successful in 45m11s
ci / x86_64-windows-release (pull_request) Successful in 48m18s
ci / x86_64-openbsd-debug (pull_request) Successful in 48m37s
ci / x86_64-windows-debug (pull_request) Successful in 49m15s
ci / x86_64-linux-debug (pull_request) Successful in 1h3m59s
ci / aarch64-macos-release (pull_request) Successful in 1h5m22s
ci / aarch64-macos-debug (pull_request) Successful in 1h16m20s
ci / riscv64-linux-debug (pull_request) Has been skipped
ci / riscv64-linux-release (pull_request) Has been skipped
ci / aarch64-linux-release (pull_request) Successful in 1h37m10s
ci / s390x-linux-release (pull_request) Successful in 1h49m3s
ci / aarch64-linux-debug (pull_request) Successful in 2h25m49s
ci / powerpc64le-linux-release (pull_request) Successful in 2h39m53s
ci / x86_64-linux-release (pull_request) Successful in 2h45m17s
ci / s390x-linux-debug (pull_request) Successful in 2h46m18s
ci / x86_64-linux-debug-llvm (pull_request) Successful in 2h47m22s
ci / loongarch64-linux-release (pull_request) Successful in 2h25m19s
ci / powerpc64le-linux-debug (pull_request) Successful in 3h56m18s
ci / loongarch64-linux-debug (pull_request) Successful in 3h23m59s
ci / x86_64-netbsd-debug (pull_request) Successful in 49m39s
ci / x86_64-netbsd-release (pull_request) Successful in 54m48s
ci / aarch64-freebsd-release (pull_request) Successful in 2h59m15s
ci / aarch64-freebsd-debug (pull_request) Successful in 4h42m38s
ci / aarch64-netbsd-debug (pull_request) Successful in 5h15m30s
ci / aarch64-netbsd-release (pull_request) Successful in 3h27m39s
2026年05月19日 08:32:05 +02:00 Compare
squeek502 left a comment
Copy link

Thanks!

Thanks!
squeek502 referenced this pull request from a commit 2026年06月13日 00:30:18 +02:00
Sign in to join this conversation.
No reviewers
Labels
Clear labels
abi/f32
abi/ilp32
abi/sf
accepted
This proposal is planned.
arch/21k
arch/6502
arch/aarch64
arch/alpha
arch/amdgcn
arch/arc
arch/arc32
arch/arc64
arch/arm
arch/avr
arch/bfin
arch/bpf
arch/colossus
arch/cris
arch/csky
arch/dlx
arch/epiphany
arch/fr30
arch/frv
arch/hexagon
arch/hppa
arch/hppa64
arch/ia64
arch/kalimba
arch/kvx
arch/lanai
arch/lm32
arch/loongarch32
arch/loongarch64
arch/m32r
arch/m68k
arch/m88k
arch/mcore
arch/microblaze
arch/mips
arch/mips64
arch/mmix
arch/moxie
arch/mrisc32
arch/msp430
arch/nds32
arch/ns32k
arch/nvptx
arch/or1k
arch/powerpc
arch/powerpc64
arch/propeller
arch/riscv32
arch/riscv64
arch/rl78
arch/rx
arch/s390x
arch/sh
arch/sparc
arch/sparc64
arch/spirv
arch/spu
arch/tricore
arch/v850
arch/vax
arch/vc4
arch/ve
arch/wasm
arch/x86
arch/x86_64
arch/xcore
arch/xtensa
autodoc
The web application for interactive documentation and generation of its assets.
backend/c
The C backend outputs C source code.
backend/llvm
The LLVM backend outputs an LLVM bitcode module.
backend/self-hosted
The self-hosted backends produce machine code directly.
binutils
Zig's included binary utilities: zig ar, zig dlltool, zig lib, zig ranlib, zig objcopy, and zig rc.
breaking
Implementing this issue could cause existing code to no longer compile or have different behavior.
build system
The Zig build system - zig build, std.Build, the build runner, and package management.
debug info
An issue related to debug information (e.g. DWARF) produced by the Zig compiler.
docs
An issue with documentation, e.g. the language reference or standard library doc comments.
error message
This issue points out an error message that is unhelpful and should be improved.
frontend
Tokenization, parsing, AstGen, ZonGen, Sema, Legalize, and Liveness.
fuzzing
An issue related to Zig's integrated fuzz testing.
incremental
Reuse of internal compiler state for faster compilation.
lib/c
This issue relates to Zig's libc implementation and/or vendored libcs.
lib/compiler-rt
This issue relates to Zig's compiler-rt library.
lib/cxx
This issue relates to Zig's vendored libc++ and/or libc++abi.
lib/std
This issue relates to Zig's standard library.
lib/tsan
This issue relates to Zig's vendored libtsan.
lib/ubsan-rt
This issue relates to Zig's ubsan-rt library.
lib/unwind
This issue relates to Zig's vendored libunwind.
linking
Zig's integrated object file and incremental linker.
miscompilation
The compiler reports success but produces semantically incorrect code.
os/android
os/contiki
os/dragonfly
os/driverkit
os/emscripten
os/freebsd
os/fuchsia
os/haiku
os/hermit
os/hurd
os/illumos
os/ios
os/linux
os/maccatalyst
os/macos
os/managarm
os/netbsd
os/ohos
os/openbsd
os/plan9
os/redox
os/rtems
os/serenity
os/tvos
os/uefi
os/visionos
os/wasi
os/watchos
os/windows
proposal
This issue suggests language modifications. If it also has the "accepted" label then it is planned.
release notes
This issue or pull request should be mentioned in the release notes.
testing
This issue is related to testing the compiler, standard library, or other parts of Zig.
zig cc
Zig as a drop-in C-family compiler.
zig fmt
The Zig source code formatter.
zig reduce
The Zig source code reduction tool.
bounty
https://ziglang.org/news/announcing-donor-bounties
bug
Observed behavior contradicts documented or intended behavior.
contributor-friendly
This issue is limited in scope and/or knowledge of project internals.
downstream
An issue with a third-party project that uses this project.
enhancement
Solving this issue will likely involve adding new logic or components to the codebase.
infra
An issue related to project infrastructure, e.g. continuous integration.
optimization
A task to improve performance and/or resource usage.
question
No questions on the issue tracker; use a community space instead.
regression
Something that used to work in a previous version stopped working
upstream
An issue with a third-party project that this project uses.
use case
Describes a real use case that is difficult or impossible, but does not propose a solution.
No labels
abi/f32
abi/ilp32
abi/sf
accepted
arch/21k
arch/6502
arch/aarch64
arch/alpha
arch/amdgcn
arch/arc
arch/arc32
arch/arc64
arch/arm
arch/avr
arch/bfin
arch/bpf
arch/colossus
arch/cris
arch/csky
arch/dlx
arch/epiphany
arch/fr30
arch/frv
arch/hexagon
arch/hppa
arch/hppa64
arch/ia64
arch/kalimba
arch/kvx
arch/lanai
arch/lm32
arch/loongarch32
arch/loongarch64
arch/m32r
arch/m68k
arch/m88k
arch/mcore
arch/microblaze
arch/mips
arch/mips64
arch/mmix
arch/moxie
arch/mrisc32
arch/msp430
arch/nds32
arch/ns32k
arch/nvptx
arch/or1k
arch/powerpc
arch/powerpc64
arch/propeller
arch/riscv32
arch/riscv64
arch/rl78
arch/rx
arch/s390x
arch/sh
arch/sparc
arch/sparc64
arch/spirv
arch/spu
arch/tricore
arch/v850
arch/vax
arch/vc4
arch/ve
arch/wasm
arch/x86
arch/x86_64
arch/xcore
arch/xtensa
autodoc
backend/c
backend/llvm
backend/self-hosted
binutils
breaking
build system
debug info
docs
error message
frontend
fuzzing
incremental
lib/c
lib/compiler-rt
lib/cxx
lib/std
lib/tsan
lib/ubsan-rt
lib/unwind
linking
miscompilation
os/android
os/contiki
os/dragonfly
os/driverkit
os/emscripten
os/freebsd
os/fuchsia
os/haiku
os/hermit
os/hurd
os/illumos
os/ios
os/linux
os/maccatalyst
os/macos
os/managarm
os/netbsd
os/ohos
os/openbsd
os/plan9
os/redox
os/rtems
os/serenity
os/tvos
os/uefi
os/visionos
os/wasi
os/watchos
os/windows
proposal
release notes
testing
zig cc
zig fmt
zig reduce
bounty
bug
contributor-friendly
downstream
enhancement
infra
optimization
question
regression
upstream
use case
Milestone
Clear milestone
No items
No milestone
Projects
Clear projects
No items
No project
Assignees
Clear assignees
No assignees
2 participants
Notifications
Due date
The due date is invalid or out of range. Please use the format "yyyy-mm-dd".

No due date set.

Dependencies

No dependencies set.

Reference
ziglang/zig!35232
Reference in a new issue
ziglang/zig
No description provided.
Delete branch "l1yefeng/zig:master"

Deleting a branch is permanent. Although the deleted branch may continue to exist for a short time before it actually gets removed, it CANNOT be undone in most cases. Continue?