zig

commit 67ee68fc9eb02b78d7a2c26c617a16f60f91012d (tree)
parent b37fdf387a10bf76facc85a882f9ec7a8279c17a
Author: Andrew Kelley <andrew@ziglang.org>
Date:   Thu, 12 Oct 2023 15:48:16 -0700

Merge pull request #17498 from ziglang/fix-fetch

path-related fixes for Package.Fetch and Package.Manifest
Diffstat:
M
src/Package/Fetch.zig
 | 
2
++
M
src/Package/Manifest.zig
 | 
2
+-

2 files changed, 3 insertions(+), 1 deletion(-)
diff --git a/src/Package/Fetch.zig b/src/Package/Fetch.zig
@@ -1507,6 +1507,7 @@ const Filter = struct {
     pub fn includePath(self: Filter, sub_path: []const u8) bool {
         if (self.include_paths.count() == 0) return true;
         if (self.include_paths.contains("")) return true;
+        if (self.include_paths.contains(".")) return true;
         if (self.include_paths.contains(sub_path)) return true;
 
         // Check if any included paths are parent directories of sub_path.
@@ -1571,4 +1572,5 @@ const ErrorBundle = std.zig.ErrorBundle;
 
 test {
     _ = Filter;
+    _ = FileType;
 }
diff --git a/src/Package/Manifest.zig b/src/Package/Manifest.zig
@@ -313,7 +313,7 @@ const Parse = struct {
         var buf: [2]Ast.Node.Index = undefined;
         const array_init = ast.fullArrayInit(&buf, node) orelse {
             const tok = main_tokens[node];
-            return fail(p, tok, "expected paths expression to be a struct", .{});
+            return fail(p, tok, "expected paths expression to be a list of strings", .{});
         };
 
         for (array_init.ast.elements) |elem_node| {