Ekdohibs
/
zig
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Moved the check for formatting a directory 

The original check for a directory was for the `readAllAlloc` so move the check from open to read. This in turn fixes the fmt step in the build script for directories.
master
DrDeano 2020-06-20 15:12:52 +01:00 committed by Andrew Kelley
parent 5229f6ec68
commit bc0ca73887
1 changed files with 16 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
src-self-hosted/main.zig
View File

@ -684,8 +684,21 @@ fn fmtPath(fmt: *Fmt, file_path: []const u8, check_mode: bool) FmtError!void {
if (fmt.seen.exists(real_path)) return; if (fmt.seen.exists(real_path)) return;
try fmt.seen.put(real_path); try fmt.seen.put(real_path);
const source_file = fs.cwd().openFile(real_path, .{}) catch |err| switch (err) { const source_file = fs.cwd().openFile(real_path, .{}) catch |err| {
error.IsDir, error.AccessDenied => { std.debug.warn("unable to open '{}': {}\n", .{ file_path, err });
fmt.any_error = true;
return;
};
defer source_file.close();
const stat = source_file.stat() catch |err| {
std.debug.warn("unable to stat '{}': {}\n", .{ file_path, err });
fmt.any_error = true;
return;
};
const source_code = source_file.readAllAlloc(fmt.gpa, stat.size, max_src_size) catch |err| switch (err) {
error.IsDir => {
var dir = try fs.cwd().openDir(file_path, .{ .iterate = true }); var dir = try fs.cwd().openDir(file_path, .{ .iterate = true });
defer dir.close(); defer dir.close();
@ -700,23 +713,10 @@ fn fmtPath(fmt: *Fmt, file_path: []const u8, check_mode: bool) FmtError!void {
return; return;
}, },
else => { else => {
std.debug.warn("unable to open '{}': {}\n", .{ file_path, err });
fmt.any_error = true;
return;
},
};
defer source_file.close();
const stat = source_file.stat() catch |err| {
std.debug.warn("unable to stat '{}': {}\n", .{ file_path, err });
fmt.any_error = true;
return;
};
const source_code = source_file.readAllAlloc(fmt.gpa, stat.size, max_src_size) catch |err| {
std.debug.warn("unable to read '{}': {}\n", .{ file_path, err }); std.debug.warn("unable to read '{}': {}\n", .{ file_path, err });
fmt.any_error = true; fmt.any_error = true;
return; return;
},
}; };
defer fmt.gpa.free(source_code); defer fmt.gpa.free(source_code);