From 84d58aaa1fc8508cb6ec9a455e8127ff13f17e16 Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Fri, 24 Nov 2023 17:04:52 -0800
Subject: [PATCH] frontend: move BuiltinFn to std.zig namespace

---
 lib/std/zig.zig                    | 1 +
 {src => lib/std/zig}/BuiltinFn.zig | 0
 src/AstGen.zig                     | 2 +-
 src/AstRlAnnotate.zig              | 2 +-
 src/Module.zig                     | 2 +-
 src/reduce/Walk.zig                | 2 +-
 6 files changed, 5 insertions(+), 4 deletions(-)
 rename {src => lib/std/zig}/BuiltinFn.zig (100%)

diff --git a/lib/std/zig.zig b/lib/std/zig.zig
index 85d1ae4868..bd8cd26be1 100644
--- a/lib/std/zig.zig
+++ b/lib/std/zig.zig
@@ -17,6 +17,7 @@ pub const primitives = @import("zig/primitives.zig");
 pub const Ast = @import("zig/Ast.zig");
 pub const system = @import("zig/system.zig");
 pub const CrossTarget = @import("zig/CrossTarget.zig");
+pub const BuiltinFn = @import("zig/BuiltinFn.zig");
 
 // Character literal parsing
 pub const ParsedCharLiteral = string_literal.ParsedCharLiteral;
diff --git a/src/BuiltinFn.zig b/lib/std/zig/BuiltinFn.zig
similarity index 100%
rename from src/BuiltinFn.zig
rename to lib/std/zig/BuiltinFn.zig
diff --git a/src/AstGen.zig b/src/AstGen.zig
index 71c785b12f..d7a9a8abca 100644
--- a/src/AstGen.zig
+++ b/src/AstGen.zig
@@ -13,7 +13,7 @@ const StringIndexContext = std.hash_map.StringIndexContext;
 const isPrimitive = std.zig.primitives.isPrimitive;
 
 const Zir = @import("Zir.zig");
-const BuiltinFn = @import("BuiltinFn.zig");
+const BuiltinFn = std.zig.BuiltinFn;
 const AstRlAnnotate = @import("AstRlAnnotate.zig");
 
 gpa: Allocator,
diff --git a/src/AstRlAnnotate.zig b/src/AstRlAnnotate.zig
index c751adea9d..a43de68951 100644
--- a/src/AstRlAnnotate.zig
+++ b/src/AstRlAnnotate.zig
@@ -18,7 +18,7 @@ const AstRlAnnotate = @This();
 const Ast = std.zig.Ast;
 const Allocator = std.mem.Allocator;
 const AutoHashMapUnmanaged = std.AutoHashMapUnmanaged;
-const BuiltinFn = @import("BuiltinFn.zig");
+const BuiltinFn = std.zig.BuiltinFn;
 const assert = std.debug.assert;
 
 gpa: Allocator,
diff --git a/src/Module.zig b/src/Module.zig
index 3b554553f7..d41dce92a9 100644
--- a/src/Module.zig
+++ b/src/Module.zig
@@ -34,7 +34,7 @@ const isUpDir = @import("introspect.zig").isUpDir;
 const clang = @import("clang.zig");
 const InternPool = @import("InternPool.zig");
 const Alignment = InternPool.Alignment;
-const BuiltinFn = @import("BuiltinFn.zig");
+const BuiltinFn = std.zig.BuiltinFn;
 
 comptime {
     @setEvalBranchQuota(4000);
diff --git a/src/reduce/Walk.zig b/src/reduce/Walk.zig
index a27d893c5d..572243d829 100644
--- a/src/reduce/Walk.zig
+++ b/src/reduce/Walk.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const Ast = std.zig.Ast;
 const Walk = @This();
 const assert = std.debug.assert;
-const BuiltinFn = @import("../BuiltinFn.zig");
+const BuiltinFn = std.zig.BuiltinFn;
 
 ast: *const Ast,
 transformations: *std.ArrayList(Transformation),