diff --git a/lib/std/build/OptionsStep.zig b/lib/std/build/OptionsStep.zig index 362aa64f33..0ac36bdffe 100644 --- a/lib/std/build/OptionsStep.zig +++ b/lib/std/build/OptionsStep.zig @@ -177,7 +177,7 @@ fn printLiteral(out: anytype, val: anytype, indent: u8) !void { .Float, .Null, => try out.print("{any}", .{val}), - else => @compileError(comptime std.fmt.comptimePrint("`{s}` are not yet supported as build options", .{@tagName(@typeInfo(T))})), + else => @compileError(std.fmt.comptimePrint("`{s}` are not yet supported as build options", .{@tagName(@typeInfo(T))})), } } diff --git a/lib/std/fmt.zig b/lib/std/fmt.zig index ae97b76124..903dd67c3d 100644 --- a/lib/std/fmt.zig +++ b/lib/std/fmt.zig @@ -199,7 +199,7 @@ pub fn format( switch (missing_count) { 0 => unreachable, 1 => @compileError("unused argument in '" ++ fmt ++ "'"), - else => @compileError((comptime comptimePrint("{d}", .{missing_count})) ++ " unused arguments in '" ++ fmt ++ "'"), + else => @compileError(comptimePrint("{d}", .{missing_count}) ++ " unused arguments in '" ++ fmt ++ "'"), } } } diff --git a/lib/std/testing.zig b/lib/std/testing.zig index 1bda46ecce..1a7d3fd732 100644 --- a/lib/std/testing.zig +++ b/lib/std/testing.zig @@ -765,7 +765,7 @@ pub fn checkAllAllocationFailures(backing_allocator: std.mem.Allocator, comptime } const expected_args_tuple_len = fn_args_fields.len - 1; if (extra_args.len != expected_args_tuple_len) { - @compileError("The provided function expects " ++ (comptime std.fmt.comptimePrint("{d}", .{expected_args_tuple_len})) ++ " extra arguments, but the provided tuple contains " ++ (comptime std.fmt.comptimePrint("{d}", .{extra_args.len}))); + @compileError("The provided function expects " ++ std.fmt.comptimePrint("{d}", .{expected_args_tuple_len}) ++ " extra arguments, but the provided tuple contains " ++ std.fmt.comptimePrint("{d}", .{extra_args.len})); } // Setup the tuple that will actually be used with @call (we'll need to insert diff --git a/src/AstGen.zig b/src/AstGen.zig index 4e571ffda9..c9f44a6216 100644 --- a/src/AstGen.zig +++ b/src/AstGen.zig @@ -8455,8 +8455,12 @@ fn simpleUnOp( operand_node: Ast.Node.Index, tag: Zir.Inst.Tag, ) InnerError!Zir.Inst.Ref { + const prev_force_comptime = gz.force_comptime; + defer gz.force_comptime = prev_force_comptime; + switch (tag) { .tag_name, .error_name, .ptr_to_int => try emitDbgNode(gz, node), + .compile_error => gz.force_comptime = true, else => {}, } const operand = try expr(gz, scope, operand_ri, operand_node);