From 3db48d1a413cc05116643dee257649a1c0a7aa3c Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Sun, 18 Sep 2022 11:46:42 -0700
Subject: [PATCH] return narrowed error in else case of catch switch

---
 src/cmd/aquila/install.zig | 2 +-
 src/cmd/init.zig           | 4 ++--
 src/common.zig             | 2 +-
 src/main.zig               | 2 +-
 src/util/funcs.zig         | 4 ++--
 5 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/src/cmd/aquila/install.zig b/src/cmd/aquila/install.zig
index 41075079f56115138cbe9df6f942ebdc420a7add..aa07634de615c3ec769be044bee8e6fd1858db6a 100644
--- a/src/cmd/aquila/install.zig
+++ b/src/cmd/aquila/install.zig
@@ -25,7 +25,7 @@ pub fn execute(args: [][]u8) !void {
     const aqadd = @import("./add.zig");
     const pkgurl = aqadd.do(homedir, args[0]) catch |err| switch (err) {
         error.AquilaBadResponse => return,
-        else => return err,
+        else => |ee| return ee,
     };
 
     // get modfile and dep
diff --git a/src/cmd/init.zig b/src/cmd/init.zig
index 7f2bf6373a770df88ff5f870eac4bb0ec8c23c86..3b1cd88dfad6862522a350d8439ead08b207e138 100644
--- a/src/cmd/init.zig
+++ b/src/cmd/init.zig
@@ -32,12 +32,12 @@ pub fn execute(args: [][]u8) !void {
         error.NoBuildZig => {
             u.fail("init requires a build.zig file", .{});
         },
-        else => return err,
+        else => |ee| return ee,
     });
 
     const entry = if (ptype == .lib) try inquirer.forString(stdout, stdin, "package entry point:", gpa, u.detct_mainfile(gpa, u.try_index(string, args, 1, ""), null, name) catch |err| switch (err) {
         error.CantFindMain => null,
-        else => return err,
+        else => |ee| return ee,
     }) else null;
 
     const license = try inquirer.forString(stdout, stdin, "license:", gpa, try detectlicense.detectInDir(gpa, cwd));
diff --git a/src/common.zig b/src/common.zig
index 0a2930a8638c22adc90bc4db4291b95cefe56c0f..759110bf3091774a2bd80aa0b9cd24a2336fb8b3 100644
--- a/src/common.zig
+++ b/src/common.zig
@@ -252,7 +252,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO
                     const tryname = try u.detect_pkgname(options.alloc, d.name, modpath);
                     const trymain = u.detct_mainfile(options.alloc, d.main, moddirO, tryname) catch |err| switch (err) {
                         error.CantFindMain => null,
-                        else => return err,
+                        else => |ee| return ee,
                     };
                     if (trymain) |_| {
                         d.*.name = tryname;
diff --git a/src/main.zig b/src/main.zig
index 7d5e0006420327299354c9ba217c424d9a16f512..8c60fac9383a611181e473df50ab4e8669f02b47 100644
--- a/src/main.zig
+++ b/src/main.zig
@@ -59,7 +59,7 @@ pub fn main() !void {
         try sub_cmd_args.append(item);
     }
     const result = std.ChildProcess.exec(.{ .allocator = gpa, .argv = sub_cmd_args.items }) catch |e| switch (e) {
-        else => return e,
+        else => |ee| return ee,
         error.FileNotFound => {
             u.fail("unknown command \"{s}\" for \"zigmod\"", .{args[0]});
         },
diff --git a/src/util/funcs.zig b/src/util/funcs.zig
index 08880c66e53e814ac5b6dce2edf8f4ae1103fe21..b474de17bcfb9d11892efe9394df6162dcc0f359 100644
--- a/src/util/funcs.zig
+++ b/src/util/funcs.zig
@@ -49,7 +49,7 @@ pub fn does_folder_exist(fpath: string) !bool {
     const file = std.fs.cwd().openFile(fpath, .{}) catch |e| switch (e) {
         error.FileNotFound => return false,
         error.IsDir => return true,
-        else => return e,
+        else => |ee| return ee,
     };
     defer file.close();
     const s = try file.stat();
@@ -109,7 +109,7 @@ pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string)
         error.FileNotFound => {
             u.fail("\"{s}\" command not found", .{args[0]});
         },
-        else => return e,
+        else => |ee| return ee,
     };
 }
 
-- 
2.54.0