From 01fae956e2f17aa992e717e041a3dd457d440b31 Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Wed, 10 Aug 2022 18:11:37 -0700 Subject: [PATCH] update to zig master 0.10.0-dev.3017+da94227f7 --- src/lib.zig | 6 +++--- zig.mod | 1 + 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/src/lib.zig b/src/lib.zig index eba9fcfcd2e91b35c5145aad52217e9202b5f1d9..9508378bbd86d74e30c5bbdf4d6a5e75af5d1e28 100644 --- a/src/lib.zig +++ b/src/lib.zig @@ -105,7 +105,7 @@ pub fn FieldType(comptime T: type, comptime field: std.meta.FieldEnum(T)) type { return std.meta.fieldInfo(T, field).field_type; } -pub fn fileList(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]string { +pub fn fileList(alloc: std.mem.Allocator, dir: std.fs.IterableDir) ![]string { var list = std.ArrayList(string).init(alloc); defer list.deinit(); @@ -118,14 +118,14 @@ pub fn fileList(alloc: std.mem.Allocator, dir: std.fs.Dir) ![]string { return list.toOwnedSlice(); } -pub fn dirSize(alloc: std.mem.Allocator, dir: std.fs.Dir) !u64 { +pub fn dirSize(alloc: std.mem.Allocator, dir: std.fs.IterableDir) !u64 { var res: u64 = 0; var walk = try dir.walk(alloc); defer walk.deinit(); while (try walk.next()) |entry| { if (entry.kind != .File) continue; - res += try fileSize(dir, entry.path); + res += try fileSize(dir.dir, entry.path); } return res; } diff --git a/zig.mod b/zig.mod index fa95ec6412cf26edc8776c8b1d30c79928e4f1cb..e8a6a65bc59c43e7ddc0d644aaa5a62efe539c8b 100644 --- a/zig.mod +++ b/zig.mod @@ -3,5 +3,6 @@ name: extras main: src/lib.zig license: MIT description: An assortment of random utility functions that aren't in std and don't deserve their own pacakge. +min_zig_version: 0.10.0-dev.3017+da94227f7 dependencies: - src: git https://github.com/nektro/zig-range -- 2.54.0