diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index ca5a1e880c35186c1df4c323c787fadef049aa0b..01787d083ff3fb919ea57587dc2cd1234b1d1c67 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -26,14 +26,14 @@ pub fn execute(args: [][]u8) !void { }; const top_module = try common.collect_deps_deep(dir, "zig.mod", &options); - const list = &std.ArrayList(u.Module).init(gpa); - try common.collect_pkgs(top_module, list); + var list = std.ArrayList(u.Module).init(gpa); + try common.collect_pkgs(top_module, &list); - try create_depszig(dir, top_module, list); + try create_depszig(dir, top_module, &list); if (bootstrap) return; - try create_lockfile(list, dir); + try create_lockfile(&list, dir); try diff_lockfile(); } @@ -92,14 +92,14 @@ pub fn create_depszig(dir: string, top_module: u.Module, list: *std.ArrayList(u. try w.writeAll("};\n\n"); try w.writeAll("pub const package_data = struct {\n"); - const duped = &std.ArrayList(u.Module).init(gpa); + var duped = std.ArrayList(u.Module).init(gpa); for (list.items) |mod| { if (mod.is_sys_lib) { continue; } try duped.append(mod); } - try print_pkg_data_to(w, duped, &std.ArrayList(u.Module).init(gpa)); + try print_pkg_data_to(w, &duped, &std.ArrayList(u.Module).init(gpa)); try w.writeAll("};\n\n"); try w.writeAll("pub const packages = "); @@ -149,15 +149,15 @@ fn diff_lockfile() !void { if (std.mem.startsWith(u8, line, "@@")) break; } - const rems = &std.ArrayList(string).init(gpa); - const adds = &std.ArrayList(string).init(gpa); + var rems = std.ArrayList(string).init(gpa); + var adds = std.ArrayList(string).init(gpa); while (try r.readUntilDelimiterOrEofAlloc(gpa, '\n', max)) |line| { if (line[0] == ' ') continue; if (line[0] == '-') try rems.append(line[1..]); if (line[0] == '+') if (line[1] == '2') continue else try adds.append(line[1..]); } - const changes = &std.StringHashMap(DiffChange).init(gpa); + var changes = std.StringHashMap(DiffChange).init(gpa); var i: usize = 0; while (i < rems.items.len) { diff --git a/src/cmd/sum.zig b/src/cmd/sum.zig index 942e1ba8358efb8c332ee46a0944d2550368d248..1ed5ff14ae7177a90f252e9dca794206e04c104c 100644 --- a/src/cmd/sum.zig +++ b/src/cmd/sum.zig @@ -24,8 +24,8 @@ pub fn execute(args: [][]u8) !void { const w = f.writer(); // - const module_list = &std.ArrayList(u.Module).init(gpa); - try common.collect_pkgs(top_module, module_list); + var module_list = std.ArrayList(u.Module).init(gpa); + try common.collect_pkgs(top_module, &module_list); for (module_list.items) |m| { if (m.clean_path.len == 0) { diff --git a/src/cmd/zpm/search.zig b/src/cmd/zpm/search.zig index 0309bf3512ce075c5a6b5af273aa05aec7d12871..8c0d270bf8bb92e291315a50ea0b290a710f071e 100644 --- a/src/cmd/zpm/search.zig +++ b/src/cmd/zpm/search.zig @@ -19,7 +19,7 @@ pub fn execute(args: [][]u8) !void { const url = try std.mem.join(gpa, "/", &.{ zpm.server_root, "packages" }); const val = try zpm.server_fetch(url); - const arr = &std.ArrayList(zpm.Package).init(gpa); + var arr = std.ArrayList(zpm.Package).init(gpa); defer arr.deinit(); for (val.Array) |item| { diff --git a/src/common.zig b/src/common.zig index cd836212d9276ee61b1c7d4284583b2bbb90783f..215530fb0a54feb6ca4193c464181bd24acd53f1 100644 --- a/src/common.zig +++ b/src/common.zig @@ -30,7 +30,7 @@ pub const CollectOptions = struct { pub fn collect_deps_deep(dir: []const u8, mpath: []const u8, options: *CollectOptions) !u.Module { const m = try u.ModFile.init(gpa, mpath); try options.init(); - const moduledeps = &std.ArrayList(u.Module).init(gpa); + var moduledeps = std.ArrayList(u.Module).init(gpa); defer moduledeps.deinit(); try std.fs.cwd().makePath(".zigmod/deps/files"); if (m.root_files.len > 0) { @@ -56,7 +56,7 @@ pub fn collect_deps_deep(dir: []const u8, mpath: []const u8, options: *CollectOp pub fn collect_deps(dir: []const u8, mpath: []const u8, options: *CollectOptions) anyerror!u.Module { const m = try u.ModFile.init(gpa, mpath); - const moduledeps = &std.ArrayList(u.Module).init(gpa); + var moduledeps = std.ArrayList(u.Module).init(gpa); defer moduledeps.deinit(); if (m.files.len > 0) { try moduledeps.append(try add_files_package(m.id, m.files, m.name)); @@ -336,7 +336,7 @@ pub fn add_files_package(pkg_name: []const u8, dirs: []const []const u8, parent_ } pub fn parse_lockfile(path: []const u8) ![]const [4][]const u8 { - const list = &std.ArrayList([4][]const u8).init(gpa); + var list = std.ArrayList([4][]const u8).init(gpa); const max = std.math.maxInt(usize); const f = try std.fs.cwd().openFile(path, .{}); const r = f.reader(); diff --git a/src/main.zig b/src/main.zig index dd8772e6f769c843d2648e2a80fab1825cd405d0..524d3968e4bdd1829e048461e066a47354d7bf5e 100644 --- a/src/main.zig +++ b/src/main.zig @@ -53,7 +53,7 @@ pub fn main() !void { } } - var sub_cmd_args = &std.ArrayList([]const u8).init(gpa); + var sub_cmd_args = std.ArrayList([]const u8).init(gpa); try sub_cmd_args.append(try std.fmt.allocPrint(gpa, "zigmod-{s}", .{args[0]})); for (args[1..]) |item| { try sub_cmd_args.append(item); diff --git a/src/util/funcs.zig b/src/util/funcs.zig index 930294ae01e2ea98c16a7e0e0681a6c7f963196c..2483eb60015ca296e9ecf79ecb750fa11b5cd502 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -33,7 +33,7 @@ pub fn try_index(comptime T: type, array: []T, n: usize, def: T) T { } pub fn split(in: []const u8, delim: []const u8) ![][]const u8 { - const list = &std.ArrayList([]const u8).init(gpa); + var list = std.ArrayList([]const u8).init(gpa); defer list.deinit(); const iter = &std.mem.split(in, delim); while (iter.next()) |str| { @@ -90,7 +90,7 @@ pub fn trim_suffix(in: []const u8, suffix: []const u8) []const u8 { } pub fn repeat(s: []const u8, times: i32) ![]const u8 { - const list = &std.ArrayList([]const u8).init(gpa); + var list = std.ArrayList([]const u8).init(gpa); var i: i32 = 0; while (i < times) : (i += 1) { try list.append(s); @@ -175,7 +175,7 @@ pub fn run_cmd(dir: ?[]const u8, args: []const []const u8) !u32 { } pub fn list_remove(input: [][]const u8, search: []const u8) ![][]const u8 { - const list = &std.ArrayList([]const u8).init(gpa); + var list = std.ArrayList([]const u8).init(gpa); defer list.deinit(); for (input) |item| { if (!std.mem.eql(u8, item, search)) { diff --git a/src/util/modfile.zig b/src/util/modfile.zig index c8a9f01958195d7af818859ff267c5ae6b706658..d71fd063f5662b819f684b2f67882b201c9310e1 100644 --- a/src/util/modfile.zig +++ b/src/util/modfile.zig @@ -68,7 +68,7 @@ pub const ModFile = struct { } fn dep_list_by_name(alloc: *std.mem.Allocator, mapping: yaml.Mapping, prop: []const u8) anyerror![]u.Dep { - const dep_list = &std.ArrayList(u.Dep).init(alloc); + var dep_list = std.ArrayList(u.Dep).init(alloc); if (mapping.get(prop)) |dep_seq| { if (dep_seq == .sequence) { for (dep_seq.sequence) |item| { diff --git a/src/util/module.zig b/src/util/module.zig index 2d6d3f574117cb7ddae41e8a9295cf3b7c9e1722..dc01997a119b6400a479cd1d955cd0763ffc572e 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -25,7 +25,7 @@ pub const Module = struct { dep: ?u.Dep, pub fn from(dep: u.Dep, dir: []const u8, options: *common.CollectOptions) !Module { - const moddeps = &std.ArrayList(Module).init(gpa); + var moddeps = std.ArrayList(Module).init(gpa); defer moddeps.deinit(); for (dep.deps) |*d| { if (try common.get_module_from_dep(d, dir, dep.name, options)) |founddep| { @@ -54,11 +54,11 @@ pub const Module = struct { } pub fn get_hash(self: Module, cdpath: []const u8) ![]const u8 { - const file_list_1 = &std.ArrayList([]const u8).init(gpa); + var file_list_1 = std.ArrayList([]const u8).init(gpa); defer file_list_1.deinit(); - try u.file_list(try u.concat(&.{ cdpath, "/", self.clean_path }), file_list_1); + try u.file_list(try u.concat(&.{ cdpath, "/", self.clean_path }), &file_list_1); - const file_list_2 = &std.ArrayList([]const u8).init(gpa); + var file_list_2 = std.ArrayList([]const u8).init(gpa); defer file_list_2.deinit(); for (file_list_1.items) |item| { const _a = u.trim_prefix(item, cdpath); diff --git a/src/util/yaml.zig b/src/util/yaml.zig index a3481b1bd1c9da438db8a7ea381b828d9ffa2874..32af0ca694c7935b9508a4a91a7495284267c5ca 100644 --- a/src/util/yaml.zig +++ b/src/util/yaml.zig @@ -112,7 +112,7 @@ pub const Mapping = struct { } pub fn get_string_array(self: Mapping, alloc: *std.mem.Allocator, k: []const u8) ![][]const u8 { - const list = &std.ArrayList([]const u8).init(alloc); + var list = std.ArrayList([]const u8).init(alloc); defer list.deinit(); if (self.get(k)) |val| { if (val == .sequence) { @@ -154,7 +154,7 @@ pub fn parse(alloc: *std.mem.Allocator, input: []const u8) !Document { _ = c.yaml_parser_set_input_string(&parser, input.ptr, input.len); - const all_events = &std.ArrayList(Token).init(alloc); + var all_events = std.ArrayList(Token).init(alloc); var event: Token = undefined; while (true) { const p = c.yaml_parser_parse(&parser, &event); @@ -220,7 +220,7 @@ fn parse_item(p: *Parser, start: ?Token) Error!Item { } fn parse_stream(p: *Parser) Error!Stream { - const res = &std.ArrayList(Document).init(p.alloc); + var res = std.ArrayList(Document).init(p.alloc); defer res.deinit(); while (true) { @@ -250,7 +250,7 @@ fn parse_document(p: *Parser) Error!Document { } fn parse_mapping(p: *Parser) Error!Mapping { - const res = &std.ArrayList(Key).init(p.alloc); + var res = std.ArrayList(Key).init(p.alloc); defer res.deinit(); while (true) { @@ -279,7 +279,7 @@ fn parse_value(p: *Parser) Error!Value { } fn parse_sequence(p: *Parser) Error!Sequence { - const res = &std.ArrayList(Item).init(p.alloc); + var res = std.ArrayList(Item).init(p.alloc); defer res.deinit(); while (true) {