authorgravatar for bratishkaerik@landless-city.netEric Joldasov <bratishkaerik@landless-city.net> 2024-12-26 00:17:56+05:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2025-01-26 19:03:33+01:00
log317996185499c484d1b27b444ea68c3ab18db5ea
treeffaf8a408d3e7d478628618a7e2f3591bb110c0f
parent738d813619568aeaf6ddba7e5a8b8a73ccda2dc3

std.Build: add more explicit error sets to some functions

Signed-off-by: Eric Joldasov <bratishkaerik@landless-city.net>

1 files changed, 9 insertions(+), 9 deletions(-)

lib/std/Build.zig+9-9
......@@ -250,7 +250,7 @@ pub fn create(
250250 build_root: Cache.Directory,
251251 cache_root: Cache.Directory,
252252 available_deps: AvailableDeps,
253) !*Build {
253) error{OutOfMemory}!*Build {
254254 const arena = graph.arena;
255255
256256 const b = try arena.create(Build);
......@@ -318,7 +318,7 @@ fn createChild(
318318 pkg_hash: []const u8,
319319 pkg_deps: AvailableDeps,
320320 user_input_options: UserInputOptionsMap,
321) !*Build {
321) error{OutOfMemory}!*Build {
322322 const child = try createChildOnly(parent, dep_name, build_root, pkg_hash, pkg_deps, user_input_options);
323323 try determineAndApplyInstallPrefix(child);
324324 return child;
......@@ -331,7 +331,7 @@ fn createChildOnly(
331331 pkg_hash: []const u8,
332332 pkg_deps: AvailableDeps,
333333 user_input_options: UserInputOptionsMap,
334) !*Build {
334) error{OutOfMemory}!*Build {
335335 const allocator = parent.allocator;
336336 const child = try allocator.create(Build);
337337 child.* = .{
......@@ -623,7 +623,7 @@ fn hashUserInputOptionsMap(allocator: Allocator, user_input_options: UserInputOp
623623 user_option.hash(hasher);
624624}
625625
626fn determineAndApplyInstallPrefix(b: *Build) !void {
626fn determineAndApplyInstallPrefix(b: *Build) error{OutOfMemory}!void {
627627 // Create an installation directory local to this package. This will be used when
628628 // dependant packages require a standard prefix, such as include directories for C headers.
629629 var hash = b.graph.cache.hash;
......@@ -1684,7 +1684,7 @@ pub fn standardTargetOptionsQueryOnly(b: *Build, args: StandardTargetOptionsArgs
16841684 return args.default_target;
16851685}
16861686
1687pub fn addUserInputOption(b: *Build, name_raw: []const u8, value_raw: []const u8) !bool {
1687pub fn addUserInputOption(b: *Build, name_raw: []const u8, value_raw: []const u8) error{OutOfMemory}!bool {
16881688 const name = b.dupe(name_raw);
16891689 const value = b.dupe(value_raw);
16901690 const gop = try b.user_input_options.getOrPut(name);
......@@ -1736,7 +1736,7 @@ pub fn addUserInputOption(b: *Build, name_raw: []const u8, value_raw: []const u8
17361736 return false;
17371737}
17381738
1739pub fn addUserInputFlag(b: *Build, name_raw: []const u8) !bool {
1739pub fn addUserInputFlag(b: *Build, name_raw: []const u8) error{OutOfMemory}!bool {
17401740 const name = b.dupe(name_raw);
17411741 const gop = try b.user_input_options.getOrPut(name);
17421742 if (!gop.found_existing) {
......@@ -1808,7 +1808,7 @@ pub fn validateUserInputDidItFail(b: *Build) bool {
18081808 return b.invalid_user_input;
18091809}
18101810
1811fn allocPrintCmd(ally: Allocator, opt_cwd: ?[]const u8, argv: []const []const u8) ![]u8 {
1811fn allocPrintCmd(ally: Allocator, opt_cwd: ?[]const u8, argv: []const []const u8) error{OutOfMemory}![]u8 {
18121812 var buf = ArrayList(u8).init(ally);
18131813 if (opt_cwd) |cwd| try buf.writer().print("cd {s} && ", .{cwd});
18141814 for (argv) |arg| {
......@@ -1903,7 +1903,7 @@ pub fn addCheckFile(
19031903 return Step.CheckFile.create(b, file_source, options);
19041904}
19051905
1906pub fn truncateFile(b: *Build, dest_path: []const u8) !void {
1906pub fn truncateFile(b: *Build, dest_path: []const u8) (fs.Dir.MakeError || fs.Dir.StatFileError)!void {
19071907 if (b.verbose) {
19081908 log.info("truncate {s}", .{dest_path});
19091909 }
......@@ -1990,7 +1990,7 @@ fn tryFindProgram(b: *Build, full_path: []const u8) ?[]const u8 {
19901990 return null;
19911991}
19921992
1993pub fn findProgram(b: *Build, names: []const []const u8, paths: []const []const u8) ![]const u8 {
1993pub fn findProgram(b: *Build, names: []const []const u8, paths: []const []const u8) error{FileNotFound}![]const u8 {
19941994 // TODO report error for ambiguous situations
19951995 for (b.search_prefixes.items) |search_prefix| {
19961996 for (names) |name| {