fixed

Author: dravenk

src/url.zig

@@ -82,7 +82,7 @@ pub fn parseUrl(self: *URL, text: []const u8) ParseError!*URL {
         std.debug.assert(reader.get().? == '?');
         self.query = reader.readUntil(isQuerySeparator);
         if (self.values == null) {
-            self.values = std.StringHashMap(std.ArrayList([]const u8)).init(self.allocator);
+            self.values = std.StringHashMap(std.array_list.Managed([]const u8)).init(self.allocator);
         }
         try parseQuery(&self.values.?, self.query.?);
     }
@@ -149,14 +149,14 @@ pub fn parseQuery(map: *std.StringHashMap(std.array_list.Managed([]const u8)), u
         var al: std.array_list.Managed([]const u8) = undefined;
         const v = map.get(key.?);
         if (v == null) {
-            al = std.ArrayList([]const u8).initCapacity(allocator, 0) catch continue;
-            al.append(allocator, value.?) catch continue;
+            al = std.array_list.Managed([]const u8).initCapacity(allocator, 0) catch continue;
+            al.append(value.?) catch continue;
             map.put(key.?, al) catch continue;
             continue;
         }
 
         al = v.?;
-        al.append(allocator, value.?) catch continue;
+        al.append(value.?) catch continue;
         map.put(key.?, al) catch continue;
     }
 }

src/url_test.zig

@@ -35,7 +35,7 @@ test "parseUri 1" {
 
     // query=1&query2=2
 
-    var qm = std.StringHashMap(std.ArrayList([]const u8)).init(std.testing.allocator);
+    var qm = std.StringHashMap(std.array_list.Managed([]const u8)).init(std.testing.allocator);
     URL.parseQuery(&qm, result.query.?) catch return;
     defer qm.clearAndFree();
 

src/values.zig

@@ -1,6 +1,6 @@
 const std = @import("std");
 const StringArrayHashMap = std.StringArrayHashMap;
-const ArrayList = std.ArrayList;
+const ArrayList = std.array_list.Managed;
 
 // pub fn has(list: ArrayList([]const u8), value: []const u8) bool {
 //     for (list.items) |item| {

src/values_test.zig

@@ -6,17 +6,17 @@ const URL = @import("url.zig");
 const Values = @import("values.zig");
 
 test "sample1" {
-    var values: std.StringHashMap(std.ArrayList([]const u8)) = std.StringHashMap(std.ArrayList([]const u8)).init(allocator);
+    var values: std.StringHashMap(std.array_list.Managed([]const u8)) = std.StringHashMap(std.array_list.Managed([]const u8)).init(allocator);
     defer values.deinit();
-    var name = std.ArrayList([]const u8).initCapacity(allocator, 0) catch return;
-    defer name.deinit(allocator);
-    try name.append(allocator, "Ava");
+    var name = std.array_list.Managed([]const u8).initCapacity(allocator, 0) catch return;
+    defer name.deinit();
+    try name.append("Ava");
 
-    var friend = std.ArrayList([]const u8).initCapacity(allocator, 0) catch return;
-    defer friend.deinit(allocator);
-    try friend.append(allocator, "Jess");
-    try friend.append(allocator, "Sarah");
-    try friend.append(allocator, "Zoe");
+    var friend = std.array_list.Managed([]const u8).initCapacity(allocator, 0) catch return;
+    defer friend.deinit();
+    try friend.append("Jess");
+    try friend.append("Sarah");
+    try friend.append("Zoe");
 
     try values.put("name", name);
     try values.put("friend", friend);
@@ -35,7 +35,7 @@ test "sample1" {
 
 test "sample2" {
     const text = "name=Ava&friend=Jess&friend=Sarah&friend=Zoe";
-    var values: std.StringHashMap(std.ArrayList([]const u8)) = std.StringHashMap(std.ArrayList([]const u8)).init(allocator);
+    var values: std.StringHashMap(std.array_list.Managed([]const u8)) = std.StringHashMap(std.array_list.Managed([]const u8)).init(allocator);
     defer values.deinit();
     try URL.parseQuery(&values, text);
     try std.testing.expectEqualStrings("Ava", values.get("name").?.items[0]);
@@ -65,17 +65,17 @@ test "sample3" {
 }
 
 test "encode" {
-    var name = std.ArrayList([]const u8).initCapacity(allocator, 0) catch return;
-    defer name.deinit(allocator);
-    try name.append(allocator, "Ava");
+    var name = std.array_list.Managed([]const u8).initCapacity(allocator, 0) catch return;
+    defer name.deinit();
+    try name.append("Ava");
 
-    var friend = std.ArrayList([]const u8).initCapacity(allocator, 0) catch return;
-    defer friend.deinit(allocator);
-    try friend.append(allocator, "Jess");
-    try friend.append(allocator, "Sarah");
-    try friend.append(allocator, "Zoe");
+    var friend = std.array_list.Managed([]const u8).initCapacity(allocator, 0) catch return;
+    defer friend.deinit();
+    try friend.append("Jess");
+    try friend.append("Sarah");
+    try friend.append("Zoe");
 
-    var values: std.StringHashMap(std.ArrayList([]const u8)) = std.StringHashMap(std.ArrayList([]const u8)).init(allocator);
+    var values: std.StringHashMap(std.array_list.Managed([]const u8)) = std.StringHashMap(std.array_list.Managed([]const u8)).init(allocator);
     defer values.deinit();
 
     try values.put("name", name);