Skip to content

Commit 9f31788

Browse files
committed
Fix the issue of compatibility
1 parent 5d6e613 commit 9f31788

File tree

3 files changed

+24
-24
lines changed

3 files changed

+24
-24
lines changed

src/url.zig

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,7 @@ pub fn init(self: URL) URL {
3232

3333
pub fn deinit(self: *URL) void {
3434
if (self.values != null) {
35-
self.values.?.deinit();
35+
self.values.?.clearAndFree();
3636
}
3737
// self.allocator.destroy(self);
3838
}
@@ -143,14 +143,14 @@ pub fn parseQuery(map: *std.StringHashMap(std.ArrayList([]const u8)), uri_query:
143143
var al: std.ArrayList([]const u8) = undefined;
144144
const v = map.get(key.?);
145145
if (v == null) {
146-
al = std.ArrayList([]const u8).init(allocator);
147-
al.append(value.?) catch continue;
146+
al = std.ArrayList([]const u8).initCapacity(allocator, 0) catch continue;
147+
al.append(allocator, value.?) catch continue;
148148
map.put(key.?, al) catch continue;
149149
continue;
150150
}
151151

152152
al = v.?;
153-
al.append(value.?) catch continue;
153+
al.append(allocator, value.?) catch continue;
154154
map.put(key.?, al) catch continue;
155155
}
156156
}

src/url_test.zig

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@ test "parseUri 1" {
2525
try testing.expectEqualStrings("query=1&query2=2", result.query.?);
2626

2727
var querymap = result.values.?;
28-
defer querymap.deinit();
28+
defer querymap.clearAndFree();
2929
try testing.expectEqualStrings("1", querymap.get("query").?.items[0]);
3030
try testing.expectEqualStrings("2", querymap.get("query2").?.items[0]);
3131

@@ -37,7 +37,7 @@ test "parseUri 1" {
3737

3838
var qm = std.StringHashMap(std.ArrayList([]const u8)).init(std.testing.allocator);
3939
URL.parseQuery(&qm, result.query.?) catch return;
40-
defer qm.deinit();
40+
defer qm.clearAndFree();
4141

4242
try testing.expectEqualStrings("1", qm.get("query").?.items[0]);
4343
try testing.expectEqualStrings("2", qm.get("query2").?.items[0]);
@@ -61,7 +61,7 @@ test "parseUri 2" {
6161
);
6262
try testing.expectEqualStrings("name=ferret", result.query.?);
6363
var qm = url.values.?;
64-
defer qm.deinit();
64+
defer qm.clearAndFree();
6565
const vm = qm.get("name").?;
6666
try testing.expectEqualStrings("ferret", vm.items[0]);
6767
try testing.expectEqualStrings("nose", result.fragment.?);

src/values_test.zig

Lines changed: 17 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -8,15 +8,15 @@ const Values = @import("values.zig");
88
test "sample1" {
99
var values: std.StringHashMap(std.ArrayList([]const u8)) = std.StringHashMap(std.ArrayList([]const u8)).init(allocator);
1010
defer values.deinit();
11-
var name = std.ArrayList([]const u8).init(allocator);
12-
defer name.deinit();
13-
try name.append("Ava");
11+
var name = std.ArrayList([]const u8).initCapacity(allocator, 0) catch return;
12+
defer name.deinit(allocator);
13+
try name.append(allocator, "Ava");
1414

15-
var friend = std.ArrayList([]const u8).init(allocator);
16-
defer friend.deinit();
17-
try friend.append("Jess");
18-
try friend.append("Sarah");
19-
try friend.append("Zoe");
15+
var friend = std.ArrayList([]const u8).initCapacity(allocator, 0) catch return;
16+
defer friend.deinit(allocator);
17+
try friend.append(allocator, "Jess");
18+
try friend.append(allocator, "Sarah");
19+
try friend.append(allocator, "Zoe");
2020

2121
try values.put("name", name);
2222
try values.put("friend", friend);
@@ -65,15 +65,15 @@ test "sample3" {
6565
}
6666

6767
test "encode" {
68-
var name = std.ArrayList([]const u8).init(allocator);
69-
defer name.deinit();
70-
try name.append("Ava");
71-
72-
var friend = std.ArrayList([]const u8).init(allocator);
73-
defer friend.deinit();
74-
try friend.append("Jess");
75-
try friend.append("Sarah");
76-
try friend.append("Zoe");
68+
var name = std.ArrayList([]const u8).initCapacity(allocator, 0) catch return;
69+
defer name.deinit(allocator);
70+
try name.append(allocator, "Ava");
71+
72+
var friend = std.ArrayList([]const u8).initCapacity(allocator, 0) catch return;
73+
defer friend.deinit(allocator);
74+
try friend.append(allocator, "Jess");
75+
try friend.append(allocator, "Sarah");
76+
try friend.append(allocator, "Zoe");
7777

7878
var values: std.StringHashMap(std.ArrayList([]const u8)) = std.StringHashMap(std.ArrayList([]const u8)).init(allocator);
7979
defer values.deinit();

0 commit comments

Comments
 (0)