From d5f3d9ad04713fe889980e05a2a725d5ad4c8b57 Mon Sep 17 00:00:00 2001
From: Meghan Denny <hello@nektro.net>
Date: Sun, 18 Jun 2023 22:05:23 -0700
Subject: [PATCH] lots of fixes, update to zig master 0.11.0-dev.3620+c76ce25a6

---
 .github/workflows/nightly.yml |  2 +-
 .github/workflows/push.yml    |  2 +-
 README.md                     |  2 +-
 deps.zig                      | 35 ++++++++++++------------------
 docs/README.md                |  2 +-
 licenses.txt                  |  1 -
 src/cmd/aq.zig                | 10 ++++-----
 src/cmd/aquila/add.zig        |  4 ++--
 src/cmd/fetch.zig             |  2 +-
 src/cmd/generate.zig          |  2 +-
 src/cmd/license.zig           |  2 +-
 src/cmd/zpm.zig               | 41 +++++++++++++++++------------------
 src/cmd/zpm/tags.zig          | 10 ++++-----
 src/common.zig                |  2 +-
 src/util/funcs.zig            |  2 +-
 src/util/module.zig           |  2 +-
 zig.mod                       |  3 +--
 zigmod.lock                   |  9 ++++----
 18 files changed, 61 insertions(+), 72 deletions(-)

diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml
index bcc8eea4b23bb1243e924b5582e86395eac8a9bd..ba1b670991c8c983e281c40ab77fd771e4010149 100644
--- a/.github/workflows/nightly.yml
+++ b/.github/workflows/nightly.yml
@@ -26,7 +26,7 @@ jobs:
       - name: Setup Zig
         uses: goto-bus-stop/setup-zig@v1
         with:
-          version: "0.11.0-dev.2777+b95cdf0ae"
+          version: "0.11.0-dev.3620+c76ce25a6"
 
       - run: zig version
       - run: zig env
diff --git a/.github/workflows/push.yml b/.github/workflows/push.yml
index cbf56fb8a1a7a468eb83d969b585092d1405428f..bfa7aaf2db8fd59ad85e5da714f1d1ecdd3b3b3e 100644
--- a/.github/workflows/push.yml
+++ b/.github/workflows/push.yml
@@ -19,7 +19,7 @@ jobs:
       - name: Setup Zig
         uses: goto-bus-stop/setup-zig@v1
         with:
-          version: "0.11.0-dev.2777+b95cdf0ae"
+          version: "0.11.0-dev.3620+c76ce25a6"
 
       - run: zig version
       - run: zig env
diff --git a/README.md b/README.md
index dd110ae5c2713c61ac60e66af6b04e929812c802..e07a1b7f0d4912c91310dc978f1ea144429d5629 100644
--- a/README.md
+++ b/README.md
@@ -17,7 +17,7 @@ A package manager for the Zig programming language.
 - https://github.com/nektro/zigmod/releases
 
 ## Built With
-- Zig master (at least `0.11.0-dev.2777+b95cdf0ae`)
+- Zig master (at least `0.11.0-dev.3620+c76ce25a6`)
 - See [`zig.mod`](./zig.mod) and [`zigmod.lock`](./zigmod.lock)
 
 ### Build from Source
diff --git a/deps.zig b/deps.zig
index 50ded8fb04a03cfa6ff1281ea1c7d7faab6b045b..7d435661e5b8da9b348ef8c3800e72a53e63f4be 100644
--- a/deps.zig
+++ b/deps.zig
@@ -57,18 +57,17 @@ pub fn fetch(exe: *std.build.LibExeObjStep) void {
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/MasterQ32/zig-uri", "d4299ad6043ad19f2ce0676687b0bff57273eae2").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/marlersoft/zigwin32", "b70e7f818d77a0c0f39b0bd9c549e16439ff5780").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/arqv-ini", "ee395fd34e152d9067def609d86b7af5382b83b1").step);
-    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "9356ff1d2edf627b531a2829a679a7b6d908a6ca").step);
+    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/iguanaTLS", "e70995575b397f33d798339d4f1656bcdf0ab82f").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-ansi", "faf9585bfe5980c24748ee8a3e6a22faaa50b437").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-detect-license", "8f13721bd18c0e546841b6f2e11da839550d6287").step);
-    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "a74468be60283e66e9b20388372394b54219d6b0").step);
+    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-extras", "ff267312e8d714c9b9d8c44ad3291f6e509dc12f").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-inquirer", "5cc2a5565d04fe2c0085f0d6818590e800d9dcf7").step);
-    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-json", "b0111b41d725682629b7f899b90500ddad3818bf").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-leven", "550cabd5a18ace5e67761bc5b867c10e926f4314").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses", "c9b8cbf3565675a056ad4e9b57cb4f84020e7680").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-licenses-text", "3c07c6e4eb0965dafd0b029c632f823631b3169c").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-range", "4b2f12808aa09be4b27a163efc424dd4e0415992").step);
-    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "6094c777eb7b7fbadbf5102f3872d3ad0a2a630e").step);
-    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-yaml", "3f3641e90697546e7f8aeef365815c4ccab168b0").step);
+    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-time", "ca9c0e6b644d74c1d549cc2c1ee22113aa021bd8").step);
+    exe.step.dependOn(&GitExactStep.create(b, "https://github.com/nektro/zig-yaml", "e56b9fed6c0afd1c4d29bedc08c3899ffe1165e9").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/hzzp", "501386e13b2f7849128f3b271d23de6127b1d9d7").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/truemedian/zfetch", "829973144f680cd16be16923041fa810c1dee417").step);
     exe.step.dependOn(&GitExactStep.create(b, "https://github.com/ziglibs/known-folders", "d13ba6137084e55f873f6afb67447fe8906cc951").step);
@@ -158,7 +157,7 @@ pub const Package = struct {
 };
 
 fn checkMinZig(current: std.SemanticVersion, exe: *std.build.LibExeObjStep) void {
-    const min = std.SemanticVersion.parse("0.11.0-dev.2777+b95cdf0ae") catch return;
+    const min = std.SemanticVersion.parse("0.11.0-dev.3620+c76ce25a6") catch return;
     if (current.order(min).compare(.lt)) @panic(exe.step.owner.fmt("Your Zig version v{} does not meet the minimum build requirement of v{}", .{current, min}));
 }
 
@@ -179,9 +178,9 @@ pub const package_data = struct {
         .entry = "/git/github.com/nektro/arqv-ini/ee395fd34e152d9067def609d86b7af5382b83b1/src/ini.zig",
     };
     pub var _csbnipaad8n7 = Package{
-        .store = "/git/github.com/nektro/iguanaTLS/9356ff1d2edf627b531a2829a679a7b6d908a6ca",
+        .store = "/git/github.com/nektro/iguanaTLS/e70995575b397f33d798339d4f1656bcdf0ab82f",
         .name = "iguanaTLS",
-        .entry = "/git/github.com/nektro/iguanaTLS/9356ff1d2edf627b531a2829a679a7b6d908a6ca/src/main.zig",
+        .entry = "/git/github.com/nektro/iguanaTLS/e70995575b397f33d798339d4f1656bcdf0ab82f/src/main.zig",
     };
     pub var _s84v9o48ucb0 = Package{
         .store = "/git/github.com/nektro/zig-ansi/faf9585bfe5980c24748ee8a3e6a22faaa50b437",
@@ -189,15 +188,9 @@ pub const package_data = struct {
         .entry = "/git/github.com/nektro/zig-ansi/faf9585bfe5980c24748ee8a3e6a22faaa50b437/src/lib.zig",
     };
     pub var _f7dubzb7cyqe = Package{
-        .store = "/git/github.com/nektro/zig-extras/a74468be60283e66e9b20388372394b54219d6b0",
+        .store = "/git/github.com/nektro/zig-extras/ff267312e8d714c9b9d8c44ad3291f6e509dc12f",
         .name = "extras",
-        .entry = "/git/github.com/nektro/zig-extras/a74468be60283e66e9b20388372394b54219d6b0/src/lib.zig",
-    };
-    pub var _ocmr9rtohgcc = Package{
-        .store = "/git/github.com/nektro/zig-json/b0111b41d725682629b7f899b90500ddad3818bf",
-        .name = "json",
-        .entry = "/git/github.com/nektro/zig-json/b0111b41d725682629b7f899b90500ddad3818bf/src/lib.zig",
-        .deps = &[_]*Package{ &_f7dubzb7cyqe },
+        .entry = "/git/github.com/nektro/zig-extras/ff267312e8d714c9b9d8c44ad3291f6e509dc12f/src/lib.zig",
     };
     pub var _0npcrzfdlrvk = Package{
         .store = "/git/github.com/nektro/zig-licenses/c9b8cbf3565675a056ad4e9b57cb4f84020e7680",
@@ -233,15 +226,15 @@ pub const package_data = struct {
         .deps = &[_]*Package{ &_pt88y5d80m25, &_96h80ezrvj7i },
     };
     pub var _iecwp4b3bsfm = Package{
-        .store = "/git/github.com/nektro/zig-time/6094c777eb7b7fbadbf5102f3872d3ad0a2a630e",
+        .store = "/git/github.com/nektro/zig-time/ca9c0e6b644d74c1d549cc2c1ee22113aa021bd8",
         .name = "time",
-        .entry = "/git/github.com/nektro/zig-time/6094c777eb7b7fbadbf5102f3872d3ad0a2a630e/time.zig",
+        .entry = "/git/github.com/nektro/zig-time/ca9c0e6b644d74c1d549cc2c1ee22113aa021bd8/time.zig",
         .deps = &[_]*Package{ &_f7dubzb7cyqe },
     };
     pub var _g982zq6e8wsv = Package{
-        .store = "/git/github.com/nektro/zig-yaml/3f3641e90697546e7f8aeef365815c4ccab168b0",
+        .store = "/git/github.com/nektro/zig-yaml/e56b9fed6c0afd1c4d29bedc08c3899ffe1165e9",
         .name = "yaml",
-        .entry = "/git/github.com/nektro/zig-yaml/3f3641e90697546e7f8aeef365815c4ccab168b0/yaml.zig",
+        .entry = "/git/github.com/nektro/zig-yaml/e56b9fed6c0afd1c4d29bedc08c3899ffe1165e9/yaml.zig",
         .deps = &[_]*Package{ &_f7dubzb7cyqe },
     };
     pub var _9k24gimke1an = Package{
@@ -263,7 +256,7 @@ pub const package_data = struct {
     pub var _89ujp8gq842x = Package{
         .name = "zigmod",
         .entry = "/../..//src/lib.zig",
-        .deps = &[_]*Package{ &_g982zq6e8wsv, &_s84v9o48ucb0, &_2ta738wrqbaq, &_0npcrzfdlrvk, &_ejw82j2ipa0e, &_ocmr9rtohgcc, &_2ovav391ivak, &_c1xirp1ota5p, &_u7sysdckdymi, &_iecwp4b3bsfm, &_f7dubzb7cyqe },
+        .deps = &[_]*Package{ &_g982zq6e8wsv, &_s84v9o48ucb0, &_2ta738wrqbaq, &_0npcrzfdlrvk, &_ejw82j2ipa0e, &_2ovav391ivak, &_c1xirp1ota5p, &_u7sysdckdymi, &_iecwp4b3bsfm, &_f7dubzb7cyqe },
     };
     pub var _root = Package{
     };
diff --git a/docs/README.md b/docs/README.md
index 22ae38aefce569fb47756262eb9a1fc7197e93f6..98e5ff57b1e3421e7af34a47797d7b4ec39f37e2 100644
--- a/docs/README.md
+++ b/docs/README.md
@@ -10,7 +10,7 @@ The rest of this documentation will assume you already have Zig installed.
 
 As Zig is still in development itself, if you plan to contribute to Zigmod you will need a master download of Zig. Those can be obtained from https://ziglang.org/download/#release-master.
 
-The earliest Zig release this Zigmod was verified to work with is `0.11.0-dev.2777+b95cdf0ae`.
+The earliest Zig release this Zigmod was verified to work with is `0.11.0-dev.3620+c76ce25a6`.
 
 ## Download
 You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source.
diff --git a/licenses.txt b/licenses.txt
index 4c45c431f0df5c66bd9b4cb954723862eb7abd92..0ad5694e9227d2bd19df53bce88e6794a1342904 100644
--- a/licenses.txt
+++ b/licenses.txt
@@ -9,7 +9,6 @@ MIT:
 - git https://github.com/nektro/zig-detect-license
 - git https://github.com/nektro/zig-extras
 - git https://github.com/nektro/zig-inquirer
-- git https://github.com/nektro/zig-json
 - git https://github.com/nektro/zig-leven
 - git https://github.com/nektro/zig-licenses
 - git https://github.com/nektro/zig-licenses-text
diff --git a/src/cmd/aq.zig b/src/cmd/aq.zig
index 0350da9944d6a9ed8420916fdeccf3bf88feeec8..db7f640680088b08a3c76d437c6ef8d775587adf 100644
--- a/src/cmd/aq.zig
+++ b/src/cmd/aq.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const string = []const u8;
 const gpa = std.heap.c_allocator;
 const zfetch = @import("zfetch");
-const json = @import("json");
+const extras = @import("extras");
 
 const u = @import("./../util/index.zig");
 
@@ -43,7 +43,7 @@ pub fn execute(args: [][]u8) !void {
     u.fail("unknown command \"{s}\" for \"zigmod aq\"", .{args[0]});
 }
 
-pub fn server_fetch(url: string) !json.Value {
+pub fn server_fetch(url: string) !std.json.ValueTree {
     const req = try zfetch.Request.init(gpa, url, null);
     defer req.deinit();
 
@@ -55,10 +55,10 @@ pub fn server_fetch(url: string) !json.Value {
 
     const r = req.reader();
     const body_content = try r.readAllAlloc(gpa, std.math.maxInt(usize));
-    const val = try json.parse(gpa, body_content);
+    const val = try extras.parse_json(gpa, body_content);
 
-    if (val.getT("message", .String)) |msg| {
-        std.log.err("server: {s}", .{msg});
+    if (val.root.object.get("message")) |msg| {
+        std.log.err("server: {s}", .{msg.string});
         return error.AquilaBadResponse;
     }
     return val;
diff --git a/src/cmd/aquila/add.zig b/src/cmd/aquila/add.zig
index 710a37ff2db008bc433b6f4154b5889db26ef5a9..96ce0638fb8a354dff32ab5991d3c266fae31e9e 100644
--- a/src/cmd/aquila/add.zig
+++ b/src/cmd/aquila/add.zig
@@ -19,8 +19,8 @@ pub fn do(dir: std.fs.Dir, pkg_id: string) !string {
     const val = try aq.server_fetch(url);
 
     const pkg_url = try std.fmt.allocPrint(gpa, "https://{s}/{s}", .{
-        val.getT(.{ "repo", "domain" }, .String).?,
-        val.getT(.{ "package", "remote_name" }, .String).?,
+        val.root.object.get("repo").?.object.get("domain").?.string,
+        val.root.object.get("package").?.object.get("remote_name").?.string,
     });
 
     const m = try zigmod.ModFile.from_dir(gpa, dir);
diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig
index d2b384ed536cd42c2cc1157f5a6f71b6c7f4c0d3..42ce80f1ee5a71a0147d3052528fbf0ac926574b 100644
--- a/src/cmd/fetch.zig
+++ b/src/cmd/fetch.zig
@@ -165,7 +165,7 @@ fn create_lockfile(alloc: std.mem.Allocator, list: *std.ArrayList(zigmod.Module)
     const fl = try dir.createFile("zigmod.lock", .{});
     defer fl.close();
 
-    std.sort.sort(zigmod.Module, list.items, {}, zigmod.Module.lessThan);
+    std.mem.sort(zigmod.Module, list.items, {}, zigmod.Module.lessThan);
 
     const wl = fl.writer();
     try wl.writeAll("2\n");
diff --git a/src/cmd/generate.zig b/src/cmd/generate.zig
index bfa359b8af766a25ae2b797d8e29937285abaa6a..c2618ec6bd89c8cdcd12440d12df4888fd5a8b5b 100644
--- a/src/cmd/generate.zig
+++ b/src/cmd/generate.zig
@@ -26,7 +26,7 @@ pub fn execute(args: [][]u8) !void {
     var list = std.ArrayList(zigmod.Module).init(gpa);
     try common.collect_pkgs(top_module, &list);
 
-    std.sort.sort(zigmod.Module, list.items, {}, zigmod.Module.lessThan);
+    std.mem.sort(zigmod.Module, list.items, {}, zigmod.Module.lessThan);
 
     try create_depszig(gpa, cachepath, dir, top_module, list.items);
 }
diff --git a/src/cmd/license.zig b/src/cmd/license.zig
index 8251a932c07dff08dab3f427cf8f13cd7e2e4e6d..41e2d7efb5d22d220a48cce5098e2b244678921e 100644
--- a/src/cmd/license.zig
+++ b/src/cmd/license.zig
@@ -29,7 +29,7 @@ pub fn execute(args: [][]u8) !void {
     var master_list = List.init(gpa);
     errdefer master_list.deinit();
     try common.collect_pkgs(top_module, &master_list);
-    std.sort.sort(zigmod.Module, master_list.items, {}, zigmod.Module.lessThan);
+    std.mem.sort(zigmod.Module, master_list.items, {}, zigmod.Module.lessThan);
 
     var map = Map.init(gpa);
     errdefer map.deinit();
diff --git a/src/cmd/zpm.zig b/src/cmd/zpm.zig
index 311ced077546161cc5299d66115f147ff103f0d6..c509236aac5f9864002b8fc3e122140b59827ad8 100644
--- a/src/cmd/zpm.zig
+++ b/src/cmd/zpm.zig
@@ -2,7 +2,7 @@ const std = @import("std");
 const string = []const u8;
 const gpa = std.heap.c_allocator;
 const zfetch = @import("zfetch");
-const json = @import("json");
+const extras = @import("extras");
 
 const u = @import("./../util/index.zig");
 
@@ -55,14 +55,13 @@ pub fn execute(args: [][]u8) !void {
     u.fail("unknown command \"{s}\" for \"zigmod zpm\"", .{args[0]});
 }
 
-pub fn server_fetch(url: string) !json.Value {
+pub fn server_fetch(url: string) !std.json.ValueTree {
     const req = try zfetch.Request.init(gpa, url, null);
     defer req.deinit();
     try req.do(.GET, null, null);
     const r = req.reader();
     const body_content = try r.readAllAlloc(gpa, std.math.maxInt(usize));
-    const val = try json.parse(gpa, body_content);
-    return val;
+    return extras.parse_json(gpa, body_content);
 }
 
 pub fn server_fetchArray(url: string) ![]const Package {
@@ -70,39 +69,39 @@ pub fn server_fetchArray(url: string) ![]const Package {
     var list = std.ArrayList(Package).init(gpa);
     errdefer list.deinit();
 
-    for (val.Array) |item| {
-        if (item.getT("root_file", .String) == null) continue;
+    for (val.root.array.items) |item| {
+        if (item.object.get("root_file") == null) continue;
         try list.append(Package{
-            .name = item.getT("name", .String).?,
-            .author = item.getT("author", .String).?,
-            .description = item.getT("description", .String).?,
-            .tags = try valueStrArray(item.getT("tags", .Array).?),
-            .git = item.getT("git", .String).?,
-            .root_file = item.getT("root_file", .String).?,
-            .source = @intCast(u32, item.getT("source", .Int).?),
-            .links = try valueLinks(item.get("links").?),
+            .name = item.object.get("name").?.string,
+            .author = item.object.get("author").?.string,
+            .description = item.object.get("description").?.string,
+            .tags = try valueStrArray(item.object.get("tags").?.array.items),
+            .git = item.object.get("git").?.string,
+            .root_file = item.object.get("root_file").?.string,
+            .source = @intCast(u32, item.object.get("source").?.integer),
+            .links = try valueLinks(item.object.get("links").?),
         });
     }
     return list.toOwnedSlice();
 }
 
-fn valueStrArray(vals: []json.Value) ![]string {
+fn valueStrArray(vals: []std.json.Value) ![]string {
     var list = std.ArrayList(string).init(gpa);
     errdefer list.deinit();
 
     for (vals) |item| {
-        if (item != .String) continue;
-        try list.append(item.String);
+        if (item != .string) continue;
+        try list.append(item.string);
     }
     return list.toOwnedSlice();
 }
 
-fn valueLinks(vals: json.Value) ![]?string {
+fn valueLinks(vals: std.json.Value) ![]?string {
     var list = std.ArrayList(?string).init(gpa);
     errdefer list.deinit();
 
-    try list.append(vals.getT("github", .String));
-    try list.append(vals.getT("aquila", .String));
-    try list.append(vals.getT("astrolabe", .String));
+    if (vals.object.get("github")) |x| try list.append(x.string);
+    if (vals.object.get("aquila")) |x| try list.append(x.string);
+    if (vals.object.get("astrolabe")) |x| try list.append(x.string);
     return list.toOwnedSlice();
 }
diff --git a/src/cmd/zpm/tags.zig b/src/cmd/zpm/tags.zig
index 0e54a2c96758c5794ff3ff3313fdca2fac8f3152..05adb810c1ab3510c15a391889d9d1d716253301 100644
--- a/src/cmd/zpm/tags.zig
+++ b/src/cmd/zpm/tags.zig
@@ -17,8 +17,8 @@ pub fn execute(args: [][]u8) !void {
 
     const name_col_width = blk: {
         var w: usize = 4;
-        for (val.Array) |tag| {
-            const len = tag.getT("name", .String).?.len;
+        for (val.root.array.items) |tag| {
+            const len = tag.object.get("name").?.string.len;
             if (len > w) {
                 w = len;
             }
@@ -30,11 +30,11 @@ pub fn execute(args: [][]u8) !void {
     try print_c_n(out, ' ', name_col_width - 4);
     try out.writeAll("DESCRIPTION\n");
 
-    for (val.Array) |tag| {
-        const name = tag.getT("name", .String).?;
+    for (val.root.array.items) |tag| {
+        const name = tag.object.get("name").?.string;
         try out.writeAll(name);
         try print_c_n(out, ' ', name_col_width - name.len);
-        try out.writeAll(tag.getT("description", .String).?);
+        try out.writeAll(tag.object.get("description").?.string);
         try out.writeAll("\n");
     }
 }
diff --git a/src/common.zig b/src/common.zig
index d862c7fe02ab2c4a0809bb636f5b5a0f0fd26f11..a54fe077ecd295fb3fa3b4d0b07664acd4840a3d 100644
--- a/src/common.zig
+++ b/src/common.zig
@@ -297,7 +297,7 @@ pub fn add_files_package(alloc: std.mem.Allocator, cachepath: string, pkg_name:
         var walker = try dir.walk(alloc);
         defer walker.deinit();
         while (try walker.next()) |p| {
-            if (p.kind == .Directory) {
+            if (p.kind == .directory) {
                 continue;
             }
             const path = try alloc.dupe(u8, p.path);
diff --git a/src/util/funcs.zig b/src/util/funcs.zig
index b540fd0f273d5ccb59f8c31f0ff33ba8e25619ac..ce802c2e99a45e77fae0b533157e2c1f65274a26 100644
--- a/src/util/funcs.zig
+++ b/src/util/funcs.zig
@@ -53,7 +53,7 @@ pub fn does_folder_exist(fpath: string) !bool {
     };
     defer file.close();
     const s = try file.stat();
-    if (s.kind != .Directory) {
+    if (s.kind != .directory) {
         return false;
     }
     return true;
diff --git a/src/util/module.zig b/src/util/module.zig
index bc52843c0ee4adc294f92bb436662ff01cc1ae4a..ac1c03de7ee97351e5f827088da9ecab731a7b7b 100644
--- a/src/util/module.zig
+++ b/src/util/module.zig
@@ -74,7 +74,7 @@ pub const Module = struct {
             try file_list_2.append(_b);
         }
 
-        std.sort.sort(string, file_list_2.items, void{}, struct {
+        std.mem.sort(string, file_list_2.items, void{}, struct {
             pub fn lt(context: void, lhs: string, rhs: string) bool {
                 _ = context;
                 return std.mem.lessThan(u8, lhs, rhs);
diff --git a/zig.mod b/zig.mod
index a10df22f566013e304e51de798f2d309a94fec6b..112720a3b13707098c70ba83d21465bac64eb4d7 100644
--- a/zig.mod
+++ b/zig.mod
@@ -3,14 +3,13 @@ name: zigmod
 main: src/lib.zig
 license: MIT
 description: A package manager for the Zig programming language.
-min_zig_version: 0.11.0-dev.2777+b95cdf0ae
+min_zig_version: 0.11.0-dev.3620+c76ce25a6
 dependencies:
   - src: git https://github.com/nektro/zig-yaml
   - src: git https://github.com/nektro/zig-ansi
   - src: git https://github.com/ziglibs/known-folders
   - src: git https://github.com/nektro/zig-licenses
   - src: git https://github.com/truemedian/zfetch
-  - src: git https://github.com/nektro/zig-json
   - src: git https://github.com/nektro/zig-detect-license
   - src: git https://github.com/nektro/zig-inquirer
   - src: git https://github.com/nektro/arqv-ini
diff --git a/zigmod.lock b/zigmod.lock
index ffc70780cd748c8acf1e7f4605d8c3e28f733887..33a0c074583cb4f9c4d99cec83d37d223f1f3745 100644
--- a/zigmod.lock
+++ b/zigmod.lock
@@ -2,18 +2,17 @@
 git https://github.com/MasterQ32/zig-uri commit-d4299ad6043ad19f2ce0676687b0bff57273eae2
 git https://github.com/marlersoft/zigwin32 commit-b70e7f818d77a0c0f39b0bd9c549e16439ff5780
 git https://github.com/nektro/arqv-ini commit-ee395fd34e152d9067def609d86b7af5382b83b1
-git https://github.com/nektro/iguanaTLS commit-9356ff1d2edf627b531a2829a679a7b6d908a6ca
+git https://github.com/nektro/iguanaTLS commit-e70995575b397f33d798339d4f1656bcdf0ab82f
 git https://github.com/nektro/zig-ansi commit-faf9585bfe5980c24748ee8a3e6a22faaa50b437
 git https://github.com/nektro/zig-detect-license commit-8f13721bd18c0e546841b6f2e11da839550d6287
-git https://github.com/nektro/zig-extras commit-a74468be60283e66e9b20388372394b54219d6b0
+git https://github.com/nektro/zig-extras commit-ff267312e8d714c9b9d8c44ad3291f6e509dc12f
 git https://github.com/nektro/zig-inquirer commit-5cc2a5565d04fe2c0085f0d6818590e800d9dcf7
-git https://github.com/nektro/zig-json commit-b0111b41d725682629b7f899b90500ddad3818bf
 git https://github.com/nektro/zig-leven commit-550cabd5a18ace5e67761bc5b867c10e926f4314
 git https://github.com/nektro/zig-licenses commit-c9b8cbf3565675a056ad4e9b57cb4f84020e7680
 git https://github.com/nektro/zig-licenses-text commit-3c07c6e4eb0965dafd0b029c632f823631b3169c
 git https://github.com/nektro/zig-range commit-4b2f12808aa09be4b27a163efc424dd4e0415992
-git https://github.com/nektro/zig-time commit-6094c777eb7b7fbadbf5102f3872d3ad0a2a630e
-git https://github.com/nektro/zig-yaml commit-3f3641e90697546e7f8aeef365815c4ccab168b0
+git https://github.com/nektro/zig-time commit-ca9c0e6b644d74c1d549cc2c1ee22113aa021bd8
+git https://github.com/nektro/zig-yaml commit-e56b9fed6c0afd1c4d29bedc08c3899ffe1165e9
 git https://github.com/truemedian/hzzp commit-501386e13b2f7849128f3b271d23de6127b1d9d7
 git https://github.com/truemedian/zfetch commit-829973144f680cd16be16923041fa810c1dee417
 git https://github.com/ziglibs/known-folders commit-d13ba6137084e55f873f6afb67447fe8906cc951
-- 
2.54.0