Commit fb7ca1ad48

Andrew Kelley <andrew@ziglang.org>
2023-01-09 22:51:03
Sema: fix merge conflict regarding identifiers matching primitives
1 parent aa7e65d
Changed files (1)
src
Sema.zig
src/Sema.zig
@@ -29337,8 +29337,8 @@ pub fn resolveTypeRequiresComptime(sema: *Sema, ty: Type) CompileError!bool {
         .anyerror,
         .noreturn,
         .@"anyframe",
-        .null,
-        .undefined,
+        .@"null",
+        .@"undefined",
         .atomic_order,
         .atomic_rmw_op,
         .calling_convention,