diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2023-06-19 22:36:24 -0700 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-06-19 22:36:24 -0700 |
| commit | a72d634b731952ee227d026c27e83c5702dcea4a (patch) | |
| tree | 8bfc4c9afa75a27ebb1108924589a8e7d5cc89ed /tools/process_headers.zig | |
| parent | c6e2e1ae4b85fc36acc89c9a5e2673834146d628 (diff) | |
| parent | a4d1edac8d65e1aa4b565f6fb11ab78541d97efa (diff) | |
| download | zig-a72d634b731952ee227d026c27e83c5702dcea4a.tar.gz zig-a72d634b731952ee227d026c27e83c5702dcea4a.zip | |
Merge pull request #16046 from BratishkaErik/issue-6128
Renaming `@xtoy` to `@YfromX`
Diffstat (limited to 'tools/process_headers.zig')
| -rw-r--r-- | tools/process_headers.zig | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tools/process_headers.zig b/tools/process_headers.zig index b93cd07a2c..a7abcb0297 100644 --- a/tools/process_headers.zig +++ b/tools/process_headers.zig @@ -32,7 +32,7 @@ const MultiArch = union(enum) { specific: Arch, fn eql(a: MultiArch, b: MultiArch) bool { - if (@enumToInt(a) != @enumToInt(b)) + if (@intFromEnum(a) != @intFromEnum(b)) return false; if (a != .specific) return true; @@ -45,7 +45,7 @@ const MultiAbi = union(enum) { specific: Abi, fn eql(a: MultiAbi, b: MultiAbi) bool { - if (@enumToInt(a) != @enumToInt(b)) + if (@intFromEnum(a) != @intFromEnum(b)) return false; if (std.meta.Tag(MultiAbi)(a) != .specific) return true; @@ -262,9 +262,9 @@ const DestTarget = struct { const HashContext = struct { pub fn hash(self: @This(), a: DestTarget) u32 { _ = self; - return @enumToInt(a.arch) +% - (@enumToInt(a.os) *% @as(u32, 4202347608)) +% - (@enumToInt(a.abi) *% @as(u32, 4082223418)); + return @intFromEnum(a.arch) +% + (@intFromEnum(a.os) *% @as(u32, 4202347608)) +% + (@intFromEnum(a.abi) *% @as(u32, 4082223418)); } pub fn eql(self: @This(), a: DestTarget, b: DestTarget, b_index: usize) bool { |