rename std.zig.CrossTarget to std.Target.Query

12 files changed, 23 insertions, 29 deletions

diff --git a/test/cbe.zig b/test/cbe.zig
index b45a4e5f72..26724a1df0 100644
--- a/test/cbe.zig
+++ b/test/cbe.zig
@@ -5,7 +5,7 @@ const nl = if (@import("builtin").os.tag == .windows) "\r\n" else "\n";
 pub fn addCases(ctx: *Cases, b: *std.Build) !void {
     // These tests should work with all platforms, but we're using linux_x64 for
     // now for consistency. Will be expanded eventually.
-    const linux_x64: std.zig.CrossTarget = .{
+    const linux_x64: std.Target.Query = .{
         .cpu_arch = .x86_64,
         .os_tag = .linux,
     };
diff --git a/test/link/elf.zig b/test/link/elf.zig
index 95bb929dc0..459244db29 100644
--- a/test/link/elf.zig
+++ b/test/link/elf.zig
@@ -3833,7 +3833,6 @@ const link = @import("link.zig");
 const std = @import("std");
 
 const Build = std.Build;
-const CrossTarget = std.zig.CrossTarget;
 const Options = link.Options;
 const Step = Build.Step;
 const WriteFile = Step.WriteFile;
diff --git a/test/link/glibc_compat/build.zig b/test/link/glibc_compat/build.zig
index 85cbc48e54..6bafb07152 100644
--- a/test/link/glibc_compat/build.zig
+++ b/test/link/glibc_compat/build.zig
@@ -8,7 +8,7 @@ pub fn build(b: *std.Build) void {
         const exe = b.addExecutable(.{
             .name = t,
             .root_source_file = .{ .path = "main.c" },
-            .target = b.resolveTargetQuery(std.zig.CrossTarget.parse(
+            .target = b.resolveTargetQuery(std.Target.Query.parse(
                 .{ .arch_os_abi = t },
             ) catch unreachable),
         });
diff --git a/test/link/link.zig b/test/link/link.zig
index d5bbbe9f4b..4d31d2d49a 100644
--- a/test/link/link.zig
+++ b/test/link/link.zig
@@ -199,7 +199,6 @@ const std = @import("std");
 
 const Build = std.Build;
 const Compile = Step.Compile;
-const CrossTarget = std.zig.CrossTarget;
 const Run = Step.Run;
 const Step = Build.Step;
 const WriteFile = Step.WriteFile;
diff --git a/test/link/macho.zig b/test/link/macho.zig
index 230107c9b2..8a5016f9b7 100644
--- a/test/link/macho.zig
+++ b/test/link/macho.zig
@@ -95,7 +95,5 @@ const addExecutable = link.addExecutable;
 const expectLinkErrors = link.expectLinkErrors;
 const link = @import("link.zig");
 const std = @import("std");
-
-const CrossTarget = std.zig.CrossTarget;
 const Options = link.Options;
 const Step = std.Build.Step;
diff --git a/test/llvm_targets.zig b/test/llvm_targets.zig
index 6a3139dd9f..99eb161a58 100644
--- a/test/llvm_targets.zig
+++ b/test/llvm_targets.zig
@@ -1,7 +1,7 @@
 const std = @import("std");
 const Cases = @import("src/Cases.zig");
 
-const targets = [_]std.zig.CrossTarget{
+const targets = [_]std.Target.Query{
     .{ .cpu_arch = .aarch64, .os_tag = .freestanding, .abi = .none },
     .{ .cpu_arch = .aarch64, .os_tag = .ios, .abi = .none },
     .{ .cpu_arch = .aarch64, .os_tag = .ios, .abi = .simulator },
diff --git a/test/src/Cases.zig b/test/src/Cases.zig
index 2aa92fc908..de7378d10a 100644
--- a/test/src/Cases.zig
+++ b/test/src/Cases.zig
@@ -188,7 +188,7 @@ pub fn exe(ctx: *Cases, name: []const u8, target: std.Build.ResolvedTarget) *Cas
     return ctx.addExe(name, target);
 }
 
-pub fn exeFromCompiledC(ctx: *Cases, name: []const u8, target_query: std.zig.CrossTarget, b: *std.Build) *Case {
+pub fn exeFromCompiledC(ctx: *Cases, name: []const u8, target_query: std.Target.Query, b: *std.Build) *Case {
     var adjusted_query = target_query;
     adjusted_query.ofmt = .c;
     ctx.cases.append(Case{
@@ -423,7 +423,7 @@ fn addFromDirInner(
         var manifest = try TestManifest.parse(ctx.arena, src);
 
         const backends = try manifest.getConfigForKeyAlloc(ctx.arena, "backend", Backend);
-        const targets = try manifest.getConfigForKeyAlloc(ctx.arena, "target", std.zig.CrossTarget);
+        const targets = try manifest.getConfigForKeyAlloc(ctx.arena, "target", std.Target.Query);
         const c_frontends = try manifest.getConfigForKeyAlloc(ctx.arena, "c_frontend", CFrontend);
         const is_test = try manifest.getConfigForKeyAssertSingle("is_test", bool);
         const link_libc = try manifest.getConfigForKeyAssertSingle("link_libc", bool);
@@ -1160,9 +1160,9 @@ const TestManifest = struct {
     }
 
     fn getDefaultParser(comptime T: type) ParseFn(T) {
-        if (T == std.zig.CrossTarget) return struct {
+        if (T == std.Target.Query) return struct {
             fn parse(str: []const u8) anyerror!T {
-                return std.zig.CrossTarget.parse(.{ .arch_os_abi = str });
+                return std.Target.Query.parse(.{ .arch_os_abi = str });
             }
         }.parse;
 
@@ -1287,7 +1287,7 @@ pub fn main() !void {
 
             if (cases.items.len == 0) {
                 const backends = try manifest.getConfigForKeyAlloc(arena, "backend", Backend);
-                const targets = try manifest.getConfigForKeyAlloc(arena, "target", std.zig.CrossTarget);
+                const targets = try manifest.getConfigForKeyAlloc(arena, "target", std.Target.Query);
                 const c_frontends = try manifest.getConfigForKeyAlloc(ctx.arena, "c_frontend", CFrontend);
                 const is_test = try manifest.getConfigForKeyAssertSingle("is_test", bool);
                 const link_libc = try manifest.getConfigForKeyAssertSingle("link_libc", bool);
@@ -1385,7 +1385,7 @@ pub fn main() !void {
     return runCases(&ctx, zig_exe_path);
 }
 
-fn resolveTargetQuery(query: std.zig.CrossTarget) std.Build.ResolvedTarget {
+fn resolveTargetQuery(query: std.Target.Query) std.Build.ResolvedTarget {
     const result = std.zig.system.NativeTargetInfo.detect(query) catch
         @panic("unable to resolve target query");
 
diff --git a/test/src/translate_c.zig b/test/src/translate_c.zig
index 71288c11da..528e370918 100644
--- a/test/src/translate_c.zig
+++ b/test/src/translate_c.zig
@@ -5,7 +5,6 @@ const ArrayList = std.ArrayList;
 const fmt = std.fmt;
 const mem = std.mem;
 const fs = std.fs;
-const CrossTarget = std.zig.CrossTarget;
 
 pub const TranslateCContext = struct {
     b: *std.Build,
@@ -18,7 +17,7 @@ pub const TranslateCContext = struct {
         sources: ArrayList(SourceFile),
         expected_lines: ArrayList([]const u8),
         allow_warnings: bool,
-        target: CrossTarget = .{},
+        target: std.Target.Query = .{},
 
         const SourceFile = struct {
             filename: []const u8,
@@ -74,7 +73,7 @@ pub const TranslateCContext = struct {
     pub fn addWithTarget(
         self: *TranslateCContext,
         name: []const u8,
-        target: CrossTarget,
+        target: std.Target.Query,
         source: []const u8,
         expected_lines: []const []const u8,
     ) void {
diff --git a/test/standalone.zig b/test/standalone.zig
index fdd3185cdf..0303c49c13 100644
--- a/test/standalone.zig
+++ b/test/standalone.zig
@@ -2,7 +2,7 @@ pub const SimpleCase = struct {
     src_path: []const u8,
     link_libc: bool = false,
     all_modes: bool = false,
-    target: std.zig.CrossTarget = .{},
+    target: std.Target.Query = .{},
     is_test: bool = false,
     is_exe: bool = true,
     /// Run only on this OS.
diff --git a/test/standalone/windows_resources/build.zig b/test/standalone/windows_resources/build.zig
index e927a03fc4..5111751571 100644
--- a/test/standalone/windows_resources/build.zig
+++ b/test/standalone/windows_resources/build.zig
@@ -4,17 +4,17 @@ pub fn build(b: *std.Build) void {
     const test_step = b.step("test", "Test it");
     b.default_step = test_step;
 
-    const cross_target = b.resolveTargetQuery(.{
+    const target = b.resolveTargetQuery(.{
         .cpu_arch = .x86_64,
         .os_tag = .windows,
         .abi = .gnu,
     });
 
     add(b, b.host, .any, test_step);
-    add(b, cross_target, .any, test_step);
+    add(b, target, .any, test_step);
 
     add(b, b.host, .gnu, test_step);
-    add(b, cross_target, .gnu, test_step);
+    add(b, target, .gnu, test_step);
 }
 
 fn add(
diff --git a/test/tests.zig b/test/tests.zig
index a8f9b62810..29d181c605 100644
--- a/test/tests.zig
+++ b/test/tests.zig
@@ -21,7 +21,7 @@ pub const CompareOutputContext = @import("src/CompareOutput.zig");
 pub const StackTracesContext = @import("src/StackTrace.zig");
 
 const TestTarget = struct {
-    target: std.zig.CrossTarget = .{},
+    target: std.Target.Query = .{},
     optimize_mode: std.builtin.OptimizeMode = .Debug,
     link_libc: ?bool = null,
     single_threaded: ?bool = null,
@@ -145,7 +145,7 @@ const test_targets = blk: {
         //},
         // https://github.com/ziglang/zig/issues/13623
         //.{
-        //    .target = std.zig.CrossTarget.parse(.{
+        //    .target = std.Target.Query.parse(.{
         //        .arch_os_abi = "arm-linux-none",
         //        .cpu_features = "generic+v8a",
         //    }) catch unreachable,
@@ -286,13 +286,13 @@ const test_targets = blk: {
         },
 
         .{
-            .target = std.zig.CrossTarget.parse(.{
+            .target = std.Target.Query.parse(.{
                 .arch_os_abi = "arm-linux-none",
                 .cpu_features = "generic+v8a",
             }) catch unreachable,
         },
         .{
-            .target = std.zig.CrossTarget.parse(.{
+            .target = std.Target.Query.parse(.{
                 .arch_os_abi = "arm-linux-musleabihf",
                 .cpu_features = "generic+v8a",
             }) catch unreachable,
@@ -300,7 +300,7 @@ const test_targets = blk: {
         },
         // https://github.com/ziglang/zig/issues/3287
         //.{
-        //    .target = std.zig.CrossTarget.parse(.{
+        //    .target = std.Target.Query.parse(.{
         //        .arch_os_abi = "arm-linux-gnueabihf",
         //        .cpu_features = "generic+v8a",
         //    }) catch unreachable,
@@ -494,7 +494,7 @@ const test_targets = blk: {
 };
 
 const CAbiTarget = struct {
-    target: std.zig.CrossTarget = .{},
+    target: std.Target.Query = .{},
     use_llvm: ?bool = null,
     use_lld: ?bool = null,
     pic: ?bool = null,
diff --git a/test/translate_c.zig b/test/translate_c.zig
index 2b87da4067..a390810830 100644
--- a/test/translate_c.zig
+++ b/test/translate_c.zig
@@ -1,7 +1,6 @@
 const std = @import("std");
 const builtin = @import("builtin");
 const tests = @import("tests.zig");
-const CrossTarget = std.zig.CrossTarget;
 
 // ********************************************************
 // *                                                      *
@@ -1846,7 +1845,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
         \\pub extern fn foo5(a: [*c]f32) callconv(.Thiscall) void;
     });
 
-    cases.addWithTarget("Calling convention", CrossTarget.parse(.{
+    cases.addWithTarget("Calling convention", std.Target.Query.parse(.{
         .arch_os_abi = "arm-linux-none",
         .cpu_features = "generic+v8_5a",
     }) catch unreachable,
@@ -1857,7 +1856,7 @@ pub fn addCases(cases: *tests.TranslateCContext) void {
         \\pub extern fn foo2(a: [*c]f32) callconv(.AAPCSVFP) void;
     });
 
-    cases.addWithTarget("Calling convention", CrossTarget.parse(.{
+    cases.addWithTarget("Calling convention", std.Target.Query.parse(.{
         .arch_os_abi = "aarch64-linux-none",
         .cpu_features = "generic+v8_5a",
     }) catch unreachable,