motiejus/zig
1
Fork 0
Code Releases Activity

Revert "Merge pull request #12060 from Vexu/IterableDir"

Browse Source 
This reverts commit da94227f78, reversing
changes made to 8f943b3d33.

I was against this change originally, but decided to approve it to keep
an open mind. After a year of trying it in practice, I firmly believe
that the previous way of doing it was better.
This commit is contained in:
Andrew Kelley
2023-11-22 12:35:33 -07:00
parent e4977f3e89
commit 519ba9bb65
10 changed files with 146 additions and 244 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
tools/update-linux-headers.zig
View File

@@ -190,14 +190,14 @@ pub fn main() !void {
try dir_stack.append(target_include_dir);
while (dir_stack.popOrNull()) |full_dir_name| {
var iterable_dir = std.fs.cwd().openIterableDir(full_dir_name, .{}) catch |err| switch (err) {
var dir = std.fs.cwd().openDir(full_dir_name, .{ .iterate = true }) catch |err| switch (err) {
error.FileNotFound => continue :search,
error.AccessDenied => continue :search,
else => return err,
};
defer iterable_dir.close();
defer dir.close();
var dir_it = iterable_dir.iterate();
var dir_it = dir.iterate();
while (try dir_it.next()) |entry| {
const full_path = try std.fs.path.join(arena, &[_][]const u8{ full_dir_name, entry.name });