From af48ce63795ca030a5eebd163af68746b8de2f0a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alex=20R=C3=B8nne=20Petersen?= Date: Wed, 30 Oct 2024 06:38:44 +0100 Subject: [PATCH] std.Target: Sort some OS switches according to the Os enum. --- lib/std/Target.zig | 274 ++++++++++++++++++++++++--------------------- 1 file changed, 148 insertions(+), 126 deletions(-) diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 49111b761b..8023418f02 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -160,48 +160,58 @@ pub const Os = struct { pub inline fn versionRangeTag(tag: Tag) @typeInfo(TaggedVersionRange).@"union".tag_type.? { return switch (tag) { .freestanding, + .other, + + .contiki, + .elfiamcu, .fuchsia, - .ps3, - .zos, - .haiku, - .rtems, + .hermit, + .aix, - .cuda, - .nvcl, - .amdhsa, + .haiku, + .hurd, + .plan9, + .rtems, + .serenity, + .zos, + + // This should use semver once we determine the version history. + .bridgeos, + + .illumos, + + .uefi, + + .ps3, .ps4, .ps5, - .elfiamcu, - .mesa3d, - .contiki, - .amdpal, - .hermit, - .hurd, + .emscripten, - .uefi, + + .amdhsa, + .amdpal, + .cuda, + .mesa3d, + .nvcl, .opencl, // TODO: OpenCL versions .opengl, // TODO: GLSL versions .vulkan, - .plan9, - .illumos, - .serenity, - .other, => .none, - // This should use semver once we determine the version history. - .bridgeos => .none, + .dragonfly, + .freebsd, + .netbsd, + .openbsd, .driverkit, - .freebsd, .macos, .ios, .tvos, - .watchos, .visionos, - .netbsd, - .openbsd, - .dragonfly, + .watchos, + .solaris, + .wasi, => .semver, @@ -391,117 +401,44 @@ pub const Os = struct { pub fn default(tag: Tag, arch: Cpu.Arch) VersionRange { return switch (tag) { .freestanding, + .other, + + .contiki, + .elfiamcu, .fuchsia, - .ps3, - .zos, - .haiku, - .rtems, + .hermit, + .aix, - .cuda, - .nvcl, - .amdhsa, + .haiku, + .hurd, + .plan9, + .rtems, + .serenity, + .zos, + + // This should use semver once we determine the version history. + .bridgeos, + + .illumos, + + .uefi, + + .ps3, .ps4, .ps5, - .elfiamcu, - .mesa3d, - .contiki, - .amdpal, - .hermit, - .hurd, + .emscripten, - .uefi, + + .amdhsa, + .amdpal, + .cuda, + .mesa3d, + .nvcl, .opencl, // TODO: OpenCL versions .opengl, // TODO: GLSL versions .vulkan, - .plan9, - .illumos, - .serenity, - .bridgeos, - .other, => .{ .none = {} }, - .freebsd => .{ - .semver = std.SemanticVersion.Range{ - .min = .{ .major = 12, .minor = 0, .patch = 0 }, - .max = .{ .major = 14, .minor = 0, .patch = 0 }, - }, - }, - .driverkit => .{ - .semver = .{ - .min = .{ .major = 19, .minor = 0, .patch = 0 }, - .max = .{ .major = 24, .minor = 0, .patch = 0 }, - }, - }, - .macos => switch (arch) { - .aarch64 => VersionRange{ - .semver = .{ - .min = .{ .major = 11, .minor = 7, .patch = 1 }, - .max = .{ .major = 14, .minor = 6, .patch = 1 }, - }, - }, - .x86_64 => VersionRange{ - .semver = .{ - .min = .{ .major = 11, .minor = 7, .patch = 1 }, - .max = .{ .major = 14, .minor = 6, .patch = 1 }, - }, - }, - else => unreachable, - }, - .ios => .{ - .semver = .{ - .min = .{ .major = 12, .minor = 0, .patch = 0 }, - .max = .{ .major = 17, .minor = 6, .patch = 1 }, - }, - }, - .watchos => .{ - .semver = .{ - .min = .{ .major = 6, .minor = 0, .patch = 0 }, - .max = .{ .major = 10, .minor = 6, .patch = 0 }, - }, - }, - .tvos => .{ - .semver = .{ - .min = .{ .major = 13, .minor = 0, .patch = 0 }, - .max = .{ .major = 17, .minor = 6, .patch = 0 }, - }, - }, - .visionos => .{ - .semver = .{ - .min = .{ .major = 1, .minor = 0, .patch = 0 }, - .max = .{ .major = 1, .minor = 3, .patch = 0 }, - }, - }, - .netbsd => .{ - .semver = .{ - .min = .{ .major = 8, .minor = 0, .patch = 0 }, - .max = .{ .major = 10, .minor = 0, .patch = 0 }, - }, - }, - .openbsd => .{ - .semver = .{ - .min = .{ .major = 7, .minor = 3, .patch = 0 }, - .max = .{ .major = 7, .minor = 5, .patch = 0 }, - }, - }, - .dragonfly => .{ - .semver = .{ - .min = .{ .major = 5, .minor = 8, .patch = 0 }, - .max = .{ .major = 6, .minor = 4, .patch = 0 }, - }, - }, - .solaris => .{ - .semver = .{ - .min = .{ .major = 11, .minor = 0, .patch = 0 }, - .max = .{ .major = 11, .minor = 4, .patch = 0 }, - }, - }, - .wasi => .{ - .semver = .{ - .min = .{ .major = 0, .minor = 1, .patch = 0 }, - .max = .{ .major = 0, .minor = 1, .patch = 0 }, - }, - }, - .linux => .{ .linux = .{ .range = .{ @@ -526,12 +463,97 @@ pub const Os = struct { }, }, + .dragonfly => .{ + .semver = .{ + .min = .{ .major = 5, .minor = 8, .patch = 0 }, + .max = .{ .major = 6, .minor = 4, .patch = 0 }, + }, + }, + .freebsd => .{ + .semver = .{ + .min = .{ .major = 12, .minor = 0, .patch = 0 }, + .max = .{ .major = 14, .minor = 0, .patch = 0 }, + }, + }, + .netbsd => .{ + .semver = .{ + .min = .{ .major = 8, .minor = 0, .patch = 0 }, + .max = .{ .major = 10, .minor = 0, .patch = 0 }, + }, + }, + .openbsd => .{ + .semver = .{ + .min = .{ .major = 7, .minor = 3, .patch = 0 }, + .max = .{ .major = 7, .minor = 5, .patch = 0 }, + }, + }, + + .driverkit => .{ + .semver = .{ + .min = .{ .major = 19, .minor = 0, .patch = 0 }, + .max = .{ .major = 24, .minor = 0, .patch = 0 }, + }, + }, + .macos => switch (arch) { + .aarch64 => .{ + .semver = .{ + .min = .{ .major = 11, .minor = 7, .patch = 1 }, + .max = .{ .major = 14, .minor = 6, .patch = 1 }, + }, + }, + .x86_64 => .{ + .semver = .{ + .min = .{ .major = 11, .minor = 7, .patch = 1 }, + .max = .{ .major = 14, .minor = 6, .patch = 1 }, + }, + }, + else => unreachable, + }, + .ios => .{ + .semver = .{ + .min = .{ .major = 12, .minor = 0, .patch = 0 }, + .max = .{ .major = 17, .minor = 6, .patch = 1 }, + }, + }, + .tvos => .{ + .semver = .{ + .min = .{ .major = 13, .minor = 0, .patch = 0 }, + .max = .{ .major = 17, .minor = 6, .patch = 0 }, + }, + }, + .visionos => .{ + .semver = .{ + .min = .{ .major = 1, .minor = 0, .patch = 0 }, + .max = .{ .major = 1, .minor = 3, .patch = 0 }, + }, + }, + .watchos => .{ + .semver = .{ + .min = .{ .major = 6, .minor = 0, .patch = 0 }, + .max = .{ .major = 10, .minor = 6, .patch = 0 }, + }, + }, + + .solaris => .{ + .semver = .{ + .min = .{ .major = 11, .minor = 0, .patch = 0 }, + .max = .{ .major = 11, .minor = 4, .patch = 0 }, + }, + }, + .windows => .{ .windows = .{ .min = .win10, .max = WindowsVersion.latest, }, }, + + .wasi => .{ + .semver = .{ + .min = .{ .major = 0, .minor = 1, .patch = 0 }, + .max = .{ .major = 0, .minor = 1, .patch = 0 }, + }, + }, }; } };