Merge pull request #12 from lun-4/zig-014

zig 0.14

Author: kivikakk

.github/workflows/zig.yml

@@ -16,7 +16,7 @@ jobs:
           submodules: recursive
       - uses: goto-bus-stop/setup-zig@v1
         with:
-          version: 0.13.0
+          version: 0.14.0
       - run: zig build
       - run: zig build test
   lint:
@@ -27,5 +27,5 @@ jobs:
           submodules: recursive
       - uses: goto-bus-stop/setup-zig@v1
         with:
-          version: 0.13.0
+          version: 0.14.0
       - run: zig fmt --check build.zig src/*.zig

.gitignore

@@ -1,2 +1,3 @@
 /.zig-cache
+/zig-cache
 /zig-out

build.zig

@@ -2,17 +2,17 @@ const std = @import("std");
 const assert = std.debug.assert;
 
 pub fn build(b: *std.Build) !void {
+    const target = b.standardTargetOptions(.{});
+    const optimize = b.standardOptimizeOption(.{});
+
     const genent = b.addExecutable(.{
         .name = "generate_entities",
         .root_source_file = b.path("src/generate_entities.zig"),
-        .target = b.host,
+        .target = target,
     });
     const genent_step = b.addRunArtifact(genent);
     const genent_out = genent_step.addOutputFileArg("entities.zig");
 
-    const target = b.standardTargetOptions(.{});
-    const optimize = b.standardOptimizeOption(.{});
-
     const mod = b.addModule("htmlentities", .{
         .root_source_file = b.path("src/main.zig"),
         .optimize = optimize,

build.zig.zon

@@ -1,9 +1,9 @@
 .{
-    .name = "htmlentities.zig",
+    .name = .htmlentities_zig,
     .version = "0.1.0",
-    .minimum_zig_version = "0.12.0",
+    .minimum_zig_version = "0.14.0",
     .dependencies = .{},
-
+    .fingerprint = 0x45088a7324835fcd,
     .paths = .{
         "entities.json",
         "build.zig",

src/main.zig

@@ -4,16 +4,16 @@ const entities = @import("entities");
 const Entity = entities.Entity;
 const Codepoints = entities.Codepoints;
 
-fn order(_: void, lhs: entities.Entity, rhs: Entity) std.math.Order {
+fn order(lhs: entities.Entity, rhs: Entity) std.math.Order {
     return std.mem.order(u8, lhs.entity, rhs.entity);
 }
 
 pub fn lookup(entity: []const u8) ?Entity {
-    const maybe_index = std.sort.binarySearch(Entity, Entity{
+    const maybe_index = std.sort.binarySearch(Entity, entities.ENTITIES[0..], Entity{
         .entity = entity,
         .codepoints = .{ .Single = 0 },
         .characters = "",
-    }, entities.ENTITIES[0..], {}, order);
+    }, order);
 
     if (maybe_index) |index| {
         return entities.ENTITIES[index];