Merge branch 'shawnl-path_max'

This does a proof of concept of changing most file system APIs to not
require an allocator and remove the possibility of failure via
OutOfMemory.

This also does most of the work of #534.

1 files changed, 2 insertions, 2 deletions

diff --git a/test/cases/merge_error_sets.zig b/test/cases/merge_error_sets.zig
index 189bd16a4d..147b580232 100644
--- a/test/cases/merge_error_sets.zig
+++ b/test/cases/merge_error_sets.zig
@@ -1,5 +1,5 @@
 const A = error{
-    PathNotFound,
+    FileNotFound,
     NotDir,
 };
 const B = error{OutOfMemory};
@@ -15,7 +15,7 @@ test "merge error sets" {
         @panic("unexpected");
     } else |err| switch (err) {
         error.OutOfMemory => @panic("unexpected"),
-        error.PathNotFound => @panic("unexpected"),
+        error.FileNotFound => @panic("unexpected"),
         error.NotDir => {},
     }
 }