aboutsummaryrefslogtreecommitdiff
path: root/lib/std/fs.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2020-04-03 22:31:15 -0400
committerGitHub <noreply@github.com>2020-04-03 22:31:15 -0400
commite89c42655cf9851cdf02065bc75cda0e27884966 (patch)
treeb25e26e53ceda1ac03e65de5d483491ee46e7c0e /lib/std/fs.zig
parent1568470c44eafb59425c070ea9884b78cc2516b2 (diff)
parent7a28c644aa8eb3d27dee113338af8278f8f6334f (diff)
downloadzig-e89c42655cf9851cdf02065bc75cda0e27884966.tar.gz
zig-e89c42655cf9851cdf02065bc75cda0e27884966.zip
Merge pull request #4868 from xackus/new-arraylist-api
new ArrayList API
Diffstat (limited to 'lib/std/fs.zig')
-rw-r--r--lib/std/fs.zig6
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/std/fs.zig b/lib/std/fs.zig
index 0eeb1758f2..feb74be2c8 100644
--- a/lib/std/fs.zig
+++ b/lib/std/fs.zig
@@ -1440,9 +1440,9 @@ pub const Walker = struct {
/// a reference to the path.
pub fn next(self: *Walker) !?Entry {
while (true) {
- if (self.stack.len == 0) return null;
+ if (self.stack.items.len == 0) return null;
// `top` becomes invalid after appending to `self.stack`.
- const top = &self.stack.span()[self.stack.len - 1];
+ const top = &self.stack.span()[self.stack.items.len - 1];
const dirname_len = top.dirname_len;
if (try top.dir_it.next()) |base| {
self.name_buffer.shrink(dirname_len);
@@ -1457,7 +1457,7 @@ pub const Walker = struct {
errdefer new_dir.close();
try self.stack.append(StackItem{
.dir_it = new_dir.iterate(),
- .dirname_len = self.name_buffer.len,
+ .dirname_len = self.name_buffer.items.len,
});
}
}