diff --git a/lib/std/Target.zig b/lib/std/Target.zig index 728521c678..ffe6173825 100644 --- a/lib/std/Target.zig +++ b/lib/std/Target.zig @@ -157,7 +157,7 @@ pub const Os = struct { }; } - pub inline fn getVersionRangeTag(tag: Tag) @typeInfo(TaggedVersionRange).@"union".tag_type.? { + pub inline fn versionRangeTag(tag: Tag) @typeInfo(TaggedVersionRange).@"union".tag_type.? { return switch (tag) { .freestanding, .fuchsia, @@ -545,8 +545,8 @@ pub const Os = struct { /// Provides a tagged union. `Target` does not store the tag because it is /// redundant with the OS tag; this function abstracts that part away. - pub inline fn getVersionRange(os: Os) TaggedVersionRange { - return switch (os.tag.getVersionRangeTag()) { + pub inline fn versionRange(os: Os) TaggedVersionRange { + return switch (os.tag.versionRangeTag()) { .none => .{ .none = {} }, .semver => .{ .semver = os.version_range.semver }, .linux => .{ .linux = os.version_range.linux }, @@ -556,12 +556,12 @@ pub const Os = struct { /// Checks if system is guaranteed to be at least `version` or older than `version`. /// Returns `null` if a runtime check is required. - pub inline fn isAtLeast(os: Os, comptime tag: Tag, ver: switch (tag.getVersionRangeTag()) { + pub inline fn isAtLeast(os: Os, comptime tag: Tag, ver: switch (tag.versionRangeTag()) { .none => void, .semver, .linux => std.SemanticVersion, .windows => WindowsVersion, }) ?bool { - return if (os.tag != tag) false else switch (tag.getVersionRangeTag()) { + return if (os.tag != tag) false else switch (tag.versionRangeTag()) { .none => true, inline .semver, .linux, diff --git a/lib/std/Target/Query.zig b/lib/std/Target/Query.zig index 7fa8c9e9c8..26001f1408 100644 --- a/lib/std/Target/Query.zig +++ b/lib/std/Target/Query.zig @@ -124,7 +124,7 @@ pub fn fromTarget(target: Target) Query { } fn updateOsVersionRange(self: *Query, os: Target.Os) void { - self.os_version_min, self.os_version_max = switch (os.tag.getVersionRangeTag()) { + self.os_version_min, self.os_version_max = switch (os.tag.versionRangeTag()) { .none => .{ .{ .none = {} }, .{ .none = {} } }, .semver => .{ .{ .semver = os.version_range.semver.min }, @@ -523,7 +523,7 @@ fn parseOs(result: *Query, diags: *ParseOptions.Diagnostics, text: []const u8) ! diags.os_tag = tag; const version_text = it.rest(); - if (version_text.len > 0) switch (tag.getVersionRangeTag()) { + if (version_text.len > 0) switch (tag.versionRangeTag()) { .none => return error.InvalidOperatingSystemVersion, .semver, .linux => range: { var range_it = mem.splitSequence(u8, version_text, "..."); diff --git a/src/Builtin.zig b/src/Builtin.zig index 58abcb7a4b..34b73f0e42 100644 --- a/src/Builtin.zig +++ b/src/Builtin.zig @@ -80,7 +80,7 @@ pub fn append(opts: @This(), buffer: *std.ArrayList(u8)) Allocator.Error!void { .{std.zig.fmtId(@tagName(target.os.tag))}, ); - switch (target.os.getVersionRange()) { + switch (target.os.versionRange()) { .none => try buffer.appendSlice(" .none = {} },\n"), .semver => |semver| try buffer.writer().print( \\ .semver = .{{ diff --git a/src/Compilation.zig b/src/Compilation.zig index c8ade90438..2776d2960a 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -877,7 +877,7 @@ pub const cache_helpers = struct { hh.addBytes(target.cpu.model.name); hh.add(target.cpu.features.ints); hh.add(target.os.tag); - hh.add(target.os.getVersionRange()); + hh.add(target.os.versionRange()); hh.add(target.abi); hh.add(target.ofmt); hh.add(resolved_target.is_native_os); @@ -5412,7 +5412,7 @@ pub fn addCCArgs( switch (ext) { .c, .cpp, .m, .mm, .h, .hpp, .hm, .hmm, .cu, .rc, .assembly, .assembly_with_cpp => { - const minver: u16 = @truncate(@intFromEnum(target.os.getVersionRange().windows.min) >> 16); + const minver: u16 = @truncate(@intFromEnum(target.os.versionRange().windows.min) >> 16); try argv.append( try std.fmt.allocPrint(arena, "-D_WIN32_WINNT=0x{x:0>4}", .{minver}), );