From 8df04e144483ff48e506522da8269af25d0bca85 Mon Sep 17 00:00:00 2001
From: Matthew Lugg <mlugg@mlugg.co.uk>
Date: Sat, 2 May 2026 11:04:28 +0100
Subject: [PATCH] std: actually rename `std.builtin` to `std.lang`

This is now the canonical name, and `std.builtin` is a deprecated alias.
---
 CMakeLists.txt                         | 3 ++-
 lib/std/{builtin.zig => lang.zig}      | 2 +-
 lib/std/{builtin => lang}/assembly.zig | 0
 lib/std/std.zig                        | 5 ++++-
 4 files changed, 7 insertions(+), 3 deletions(-)
 rename lib/std/{builtin.zig => lang.zig} (99%)
 rename lib/std/{builtin => lang}/assembly.zig (100%)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index d87f39401aa1d84ffc07cf24de35724e24fecee7..f40634b7e20ab9b8f8ea1fc9cda5ac5978a93e30 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -239,7 +239,8 @@ set(ZIG_STAGE2_SOURCES
     lib/std/atomic.zig
     lib/std/base64.zig
     lib/std/buf_map.zig
-    lib/std/builtin.zig
+    lib/std/lang.zig
+    lib/std/lang/assembly.zig
     lib/std/c.zig
     lib/std/coff.zig
     lib/std/crypto.zig
diff --git a/lib/std/builtin.zig b/lib/std/lang.zig
similarity index 99%
rename from lib/std/builtin.zig
rename to lib/std/lang.zig
index 97846ed035c64d280a94c67d9b03c720e1204e61..e06c4ba313287bbd534309df6021127a8475b6aa 100644
--- a/lib/std/builtin.zig
+++ b/lib/std/lang.zig
@@ -4,7 +4,7 @@ const builtin = @import("builtin");
 const std = @import("std.zig");
 const root = @import("root");
 
-pub const assembly = @import("builtin/assembly.zig");
+pub const assembly = @import("lang/assembly.zig");
 
 /// This data structure is used by the Zig language code generation and
 /// therefore must be kept in sync with the compiler implementation.
diff --git a/lib/std/builtin/assembly.zig b/lib/std/lang/assembly.zig
similarity index 100%
rename from lib/std/builtin/assembly.zig
rename to lib/std/lang/assembly.zig
diff --git a/lib/std/std.zig b/lib/std/std.zig
index a700a15b077f74d02e25e73969b0f47ccf7c781a..3f2fb1d62d0fb91d048c251c5c9ca569cccd4263 100644
--- a/lib/std/std.zig
+++ b/lib/std/std.zig
@@ -65,8 +65,11 @@ pub const array_hash_map = @import("array_hash_map.zig");
 pub const atomic = @import("atomic.zig");
 pub const base64 = @import("base64.zig");
 pub const bit_set = @import("bit_set.zig");
+/// Deprecated; use `lang`.
+///
+/// To be removed after Zig 0.17.0.
 pub const builtin = lang;
-pub const lang = @import("builtin.zig");
+pub const lang = @import("lang.zig");
 pub const c = @import("c.zig");
 pub const coff = @import("coff.zig");
 pub const compress = @import("compress.zig");
-- 
2.54.0