motiejus/zig
1
Fork 0
Code Releases Activity

CLI: better error message for bad input path

Browse Source 
Previously it just said `error: NotDir` but now it says
`error: unable to open '<path>': NotDir`.
This commit is contained in:
Andrew Kelley
2022-10-05 00:41:17 -07:00
parent ff534d2267
commit f4c6e5d94e
1 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/main.zig
View File

@@ -2763,7 +2763,14 @@ fn buildOutputType(
defer gpa.free(rel_src_path);
break :blk try Package.create(gpa, p, rel_src_path);
} else {
break :blk try Package.create(gpa, fs.path.dirname(src_path), fs.path.basename(src_path));
const root_src_dir_path = fs.path.dirname(src_path);
break :blk Package.create(gpa, root_src_dir_path, fs.path.basename(src_path)) catch |err| {
if (root_src_dir_path) |p| {
fatal("unable to open '{s}': {s}", .{ p, @errorName(err) });
} else {
return err;
}
};
}
} else null;
defer if (main_pkg) |p| p.destroy(gpa);
@@ -2792,7 +2799,7 @@ fn buildOutputType(
var zig_lib_directory: Compilation.Directory = if (override_lib_dir) |lib_dir| .{
.path = lib_dir,
.handle = fs.cwd().openDir(lib_dir, .{}) catch |err| {
fatal("unable to open zig lib directory from 'zig-lib-dir' argument or env, '{s}': {s}", .{ lib_dir, @errorName(err) });
fatal("unable to open zig lib directory '{s}': {s}", .{ lib_dir, @errorName(err) });
},
} else introspect.findZigLibDirFromSelfExe(arena, self_exe_path) catch |err| {
fatal("unable to find zig installation directory: {s}\n", .{@errorName(err)});