authorgravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-08 08:22:15+02:00
committergravatar for alex@alexrp.comAlex Rønne Petersen <alex@alexrp.com> 2024-10-16 22:25:29+02:00
log549a7eba40aebaad2ede0fef3a574f52315c36cf
treed0479e142fd5d46627d076cc7bc68d21f63c0a37
parent55fe86c57e5a069c0de56ff1ef2adfc80aa0ece7
signature Signed by SSH key SHA256:7B/LJ7bpR1eX8aCXSr4mtd5M45VMPKcx9zY8e95b5QM

std.Target: Rename OS version range functions to drop the "get" prefix.

4 files changed, 10 insertions(+), 10 deletions(-)

lib/std/Target.zig+5-5
...@@ -157,7 +157,7 @@ pub const Os = struct {...@@ -157,7 +157,7 @@ pub const Os = struct {
157 };157 };
158 }158 }
159159
160 pub inline fn getVersionRangeTag(tag: Tag) @typeInfo(TaggedVersionRange).@"union".tag_type.? {160 pub inline fn versionRangeTag(tag: Tag) @typeInfo(TaggedVersionRange).@"union".tag_type.? {
161 return switch (tag) {161 return switch (tag) {
162 .freestanding,162 .freestanding,
163 .fuchsia,163 .fuchsia,
...@@ -545,8 +545,8 @@ pub const Os = struct {...@@ -545,8 +545,8 @@ pub const Os = struct {
545545
546 /// Provides a tagged union. `Target` does not store the tag because it is546 /// Provides a tagged union. `Target` does not store the tag because it is
547 /// redundant with the OS tag; this function abstracts that part away.547 /// redundant with the OS tag; this function abstracts that part away.
548 pub inline fn getVersionRange(os: Os) TaggedVersionRange {548 pub inline fn versionRange(os: Os) TaggedVersionRange {
549 return switch (os.tag.getVersionRangeTag()) {549 return switch (os.tag.versionRangeTag()) {
550 .none => .{ .none = {} },550 .none => .{ .none = {} },
551 .semver => .{ .semver = os.version_range.semver },551 .semver => .{ .semver = os.version_range.semver },
552 .linux => .{ .linux = os.version_range.linux },552 .linux => .{ .linux = os.version_range.linux },
...@@ -556,12 +556,12 @@ pub const Os = struct {...@@ -556,12 +556,12 @@ pub const Os = struct {
556556
557 /// Checks if system is guaranteed to be at least `version` or older than `version`.557 /// Checks if system is guaranteed to be at least `version` or older than `version`.
558 /// Returns `null` if a runtime check is required.558 /// Returns `null` if a runtime check is required.
559 pub inline fn isAtLeast(os: Os, comptime tag: Tag, ver: switch (tag.getVersionRangeTag()) {559 pub inline fn isAtLeast(os: Os, comptime tag: Tag, ver: switch (tag.versionRangeTag()) {
560 .none => void,560 .none => void,
561 .semver, .linux => std.SemanticVersion,561 .semver, .linux => std.SemanticVersion,
562 .windows => WindowsVersion,562 .windows => WindowsVersion,
563 }) ?bool {563 }) ?bool {
564 return if (os.tag != tag) false else switch (tag.getVersionRangeTag()) {564 return if (os.tag != tag) false else switch (tag.versionRangeTag()) {
565 .none => true,565 .none => true,
566 inline .semver,566 inline .semver,
567 .linux,567 .linux,
lib/std/Target/Query.zig+2-2
...@@ -124,7 +124,7 @@ pub fn fromTarget(target: Target) Query {...@@ -124,7 +124,7 @@ pub fn fromTarget(target: Target) Query {
124}124}
125125
126fn updateOsVersionRange(self: *Query, os: Target.Os) void {126fn updateOsVersionRange(self: *Query, os: Target.Os) void {
127 self.os_version_min, self.os_version_max = switch (os.tag.getVersionRangeTag()) {127 self.os_version_min, self.os_version_max = switch (os.tag.versionRangeTag()) {
128 .none => .{ .{ .none = {} }, .{ .none = {} } },128 .none => .{ .{ .none = {} }, .{ .none = {} } },
129 .semver => .{129 .semver => .{
130 .{ .semver = os.version_range.semver.min },130 .{ .semver = os.version_range.semver.min },
...@@ -523,7 +523,7 @@ fn parseOs(result: *Query, diags: *ParseOptions.Diagnostics, text: []const u8) !...@@ -523,7 +523,7 @@ fn parseOs(result: *Query, diags: *ParseOptions.Diagnostics, text: []const u8) !
523 diags.os_tag = tag;523 diags.os_tag = tag;
524524
525 const version_text = it.rest();525 const version_text = it.rest();
526 if (version_text.len > 0) switch (tag.getVersionRangeTag()) {526 if (version_text.len > 0) switch (tag.versionRangeTag()) {
527 .none => return error.InvalidOperatingSystemVersion,527 .none => return error.InvalidOperatingSystemVersion,
528 .semver, .linux => range: {528 .semver, .linux => range: {
529 var range_it = mem.splitSequence(u8, version_text, "...");529 var range_it = mem.splitSequence(u8, version_text, "...");
src/Builtin.zig+1-1
...@@ -80,7 +80,7 @@ pub fn append(opts: @This(), buffer: *std.ArrayList(u8)) Allocator.Error!void {...@@ -80,7 +80,7 @@ pub fn append(opts: @This(), buffer: *std.ArrayList(u8)) Allocator.Error!void {
80 .{std.zig.fmtId(@tagName(target.os.tag))},80 .{std.zig.fmtId(@tagName(target.os.tag))},
81 );81 );
8282
83 switch (target.os.getVersionRange()) {83 switch (target.os.versionRange()) {
84 .none => try buffer.appendSlice(" .none = {} },\n"),84 .none => try buffer.appendSlice(" .none = {} },\n"),
85 .semver => |semver| try buffer.writer().print(85 .semver => |semver| try buffer.writer().print(
86 \\ .semver = .{{86 \\ .semver = .{{
src/Compilation.zig+2-2
...@@ -877,7 +877,7 @@ pub const cache_helpers = struct {...@@ -877,7 +877,7 @@ pub const cache_helpers = struct {
877 hh.addBytes(target.cpu.model.name);877 hh.addBytes(target.cpu.model.name);
878 hh.add(target.cpu.features.ints);878 hh.add(target.cpu.features.ints);
879 hh.add(target.os.tag);879 hh.add(target.os.tag);
880 hh.add(target.os.getVersionRange());880 hh.add(target.os.versionRange());
881 hh.add(target.abi);881 hh.add(target.abi);
882 hh.add(target.ofmt);882 hh.add(target.ofmt);
883 hh.add(resolved_target.is_native_os);883 hh.add(resolved_target.is_native_os);
...@@ -5412,7 +5412,7 @@ pub fn addCCArgs(...@@ -5412,7 +5412,7 @@ pub fn addCCArgs(
54125412
5413 switch (ext) {5413 switch (ext) {
5414 .c, .cpp, .m, .mm, .h, .hpp, .hm, .hmm, .cu, .rc, .assembly, .assembly_with_cpp => {5414 .c, .cpp, .m, .mm, .h, .hpp, .hm, .hmm, .cu, .rc, .assembly, .assembly_with_cpp => {
5415 const minver: u16 = @truncate(@intFromEnum(target.os.getVersionRange().windows.min) >> 16);5415 const minver: u16 = @truncate(@intFromEnum(target.os.versionRange().windows.min) >> 16);
5416 try argv.append(5416 try argv.append(
5417 try std.fmt.allocPrint(arena, "-D_WIN32_WINNT=0x{x:0>4}", .{minver}),5417 try std.fmt.allocPrint(arena, "-D_WIN32_WINNT=0x{x:0>4}", .{minver}),
5418 );5418 );