authorgravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2022-09-18 11:46:42 -07:00
committergravatar for hello@nektro.netMeghan Denny <hello@nektro.net> 2022-09-18 11:46:42 -07:00
log3db48d1a413cc05116643dee257649a1c0a7aa3c
tree3f97531505d1241c6e522ca48f21a2df5a81b709
parentd2bedba959d5237145318d9feb424f914bfcdf74

return narrowed error in else case of catch switch

5 files changed, 7 insertions(+), 7 deletions(-)

src/cmd/aquila/install.zig+1-1
......@@ -25,7 +25,7 @@ pub fn execute(args: [][]u8) !void {
2525 const aqadd = @import("./add.zig");
2626 const pkgurl = aqadd.do(homedir, args[0]) catch |err| switch (err) {
2727 error.AquilaBadResponse => return,
28 else => return err,
28 else => |ee| return ee,
2929 };
3030
3131 // get modfile and dep
src/cmd/init.zig+2-2
......@@ -32,12 +32,12 @@ pub fn execute(args: [][]u8) !void {
3232 error.NoBuildZig => {
3333 u.fail("init requires a build.zig file", .{});
3434 },
35 else => return err,
35 else => |ee| return ee,
3636 });
3737
3838 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) {
3939 error.CantFindMain => null,
40 else => return err,
40 else => |ee| return ee,
4141 }) else null;
4242
4343 const license = try inquirer.forString(stdout, stdin, "license:", gpa, try detectlicense.detectInDir(gpa, cwd));
src/common.zig+1-1
......@@ -252,7 +252,7 @@ pub fn get_module_from_dep(d: *zigmod.Dep, cachepath: string, options: *CollectO
252252 const tryname = try u.detect_pkgname(options.alloc, d.name, modpath);
253253 const trymain = u.detct_mainfile(options.alloc, d.main, moddirO, tryname) catch |err| switch (err) {
254254 error.CantFindMain => null,
255 else => return err,
255 else => |ee| return ee,
256256 };
257257 if (trymain) |_| {
258258 d.*.name = tryname;
src/main.zig+1-1
......@@ -59,7 +59,7 @@ pub fn main() !void {
5959 try sub_cmd_args.append(item);
6060 }
6161 const result = std.ChildProcess.exec(.{ .allocator = gpa, .argv = sub_cmd_args.items }) catch |e| switch (e) {
62 else => return e,
62 else => |ee| return ee,
6363 error.FileNotFound => {
6464 u.fail("unknown command \"{s}\" for \"zigmod\"", .{args[0]});
6565 },
src/util/funcs.zig+2-2
......@@ -49,7 +49,7 @@ pub fn does_folder_exist(fpath: string) !bool {
4949 const file = std.fs.cwd().openFile(fpath, .{}) catch |e| switch (e) {
5050 error.FileNotFound => return false,
5151 error.IsDir => return true,
52 else => return e,
52 else => |ee| return ee,
5353 };
5454 defer file.close();
5555 const s = try file.stat();
......@@ -109,7 +109,7 @@ pub fn run_cmd_raw(alloc: std.mem.Allocator, dir: ?string, args: []const string)
109109 error.FileNotFound => {
110110 u.fail("\"{s}\" command not found", .{args[0]});
111111 },
112 else => return e,
112 else => |ee| return ee,
113113 };
114114}
115115