| ... | @@ -33,7 +33,7 @@ pub const version: u16 = blk: { | ... | @@ -33,7 +33,7 @@ pub const version: u16 = blk: { |
| 33 | var version_s = build_options.version; | 33 | var version_s = build_options.version; |
| 34 | version_s = extras.trimPrefixEnsure(version_s, "r").?; | 34 | version_s = extras.trimPrefixEnsure(version_s, "r").?; |
| 35 | version_s = version_s[0 .. std.mem.indexOfScalar(u8, version_s, '-') orelse version_s.len]; | 35 | version_s = version_s[0 .. std.mem.indexOfScalar(u8, version_s, '-') orelse version_s.len]; |
| 36 | var version_i = std.fmt.parseInt(u16, version_s, 10) catch unreachable; | 36 | var version_i = extras.parseDigits(u16, version_s, 10) catch unreachable; |
| 37 | if (std.mem.indexOfScalar(u8, version_s, '-')) |_| version_i += 1; | 37 | if (std.mem.indexOfScalar(u8, version_s, '-')) |_| version_i += 1; |
| 38 | break :blk version_i; | 38 | break :blk version_i; |
| 39 | }; | 39 | }; |
| ... | @@ -42,6 +42,6 @@ pub fn meetsMinimumVersion(min_zigmod_version_raw: []const u8) ?bool { | ... | @@ -42,6 +42,6 @@ pub fn meetsMinimumVersion(min_zigmod_version_raw: []const u8) ?bool { |
| 42 | var min_zigmod_version_s = min_zigmod_version_raw; | 42 | var min_zigmod_version_s = min_zigmod_version_raw; |
| 43 | min_zigmod_version_s = extras.trimPrefixEnsure(min_zigmod_version_s, "r") orelse return null; | 43 | min_zigmod_version_s = extras.trimPrefixEnsure(min_zigmod_version_s, "r") orelse return null; |
| 44 | min_zigmod_version_s = min_zigmod_version_s[0 .. std.mem.indexOfScalar(u8, min_zigmod_version_s, '-') orelse min_zigmod_version_s.len]; | 44 | min_zigmod_version_s = min_zigmod_version_s[0 .. std.mem.indexOfScalar(u8, min_zigmod_version_s, '-') orelse min_zigmod_version_s.len]; |
| 45 | const min_zigmod_version = std.fmt.parseInt(u16, min_zigmod_version_s, 10) catch return null; | 45 | const min_zigmod_version = extras.parseDigits(u16, min_zigmod_version_s, 10) catch return null; |
| 46 | return min_zigmod_version <= version; | 46 | return min_zigmod_version <= version; |
| 47 | } | 47 | } |