diff --git a/.circleci/config.yml b/.circleci/config.yml index 477dbd3fc8d01ea997fbc4db5774ae7b1a6ea438..7a294e6ec51cbbb3f7592654728317779c89d8cd 100644 --- a/.circleci/config.yml +++ b/.circleci/config.yml @@ -15,7 +15,7 @@ jobs: - run: git submodule update --init --recursive - run: apt -y install xz-utils jq - - run: ./download_zig.sh 0.9.0-dev.689+507dc1f2e + - run: ./download_zig.sh 0.9.0-dev.794+65208a7fa - run: zig version - run: zig env - run: zig build -Dbootstrap diff --git a/README.md b/README.md index 4b57ce1bb5f7cec9e8b4a9657b383c5da1195c64..57d0094ce52efcdcb701bcd515d2c0b32d088616 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 `0.9.0-dev.689+507dc1f2e` +- Zig master `0.9.0-dev.794+65208a7fa` - https://github.com/yaml/libyaml - https://github.com/nektro/zig-ansi - https://github.com/ziglibs/known-folders diff --git a/docs/README.md b/docs/README.md index df4c61ec2cf9c065f6bf1fede8b99056aa61303d..1d2527b23de7e736bb72021bf7b1c122506afdfa 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 most recent release Zigmod was verified to work with is `0.9.0-dev.689+507dc1f2e`. +The most recent release Zigmod was verified to work with is `0.9.0-dev.794+65208a7fa`. ## Download You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. diff --git a/src/common.zig b/src/common.zig index 215530fb0a54feb6ca4193c464181bd24acd53f1..b189ea720115b27c75bc2c96f24601536e475871 100644 --- a/src/common.zig +++ b/src/common.zig @@ -349,7 +349,7 @@ pub fn parse_lockfile(path: []const u8) ![]const [4][]const u8 { } switch (v) { 1 => { - var iter = std.mem.split(line, " "); + var iter = std.mem.split(u8, line, " "); try list.append([4][]const u8{ iter.next().?, iter.next().?, @@ -358,7 +358,7 @@ pub fn parse_lockfile(path: []const u8) ![]const [4][]const u8 { }); }, 2 => { - var iter = std.mem.split(line, " "); + var iter = std.mem.split(u8, line, " "); const asdep = u.Dep{ .type = std.meta.stringToEnum(u.DepType, iter.next().?).?, .path = iter.next().?, diff --git a/src/util/funcs.zig b/src/util/funcs.zig index 2483eb60015ca296e9ecf79ecb750fa11b5cd502..86c677ced3cabb75fec54c1d716dc0253879e12c 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -35,7 +35,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 { var list = std.ArrayList([]const u8).init(gpa); defer list.deinit(); - const iter = &std.mem.split(in, delim); + var iter = std.mem.split(u8, in, delim); while (iter.next()) |str| { try list.append(str); } @@ -214,7 +214,7 @@ pub fn parse_split(comptime T: type, delim: []const u8) type { string: []const u8, pub fn do(input: []const u8) !Self { - const iter = &std.mem.split(input, delim); + var iter = std.mem.split(u8, input, delim); return Self{ .id = std.meta.stringToEnum(T, iter.next() orelse return error.IterEmpty) orelse return error.NoMemberFound, .string = iter.rest(), diff --git a/src/util/modfile.zig b/src/util/modfile.zig index d71fd063f5662b819f684b2f67882b201c9310e1..b07fb6e8b6f7966f6263c24623167390f04ecb64 100644 --- a/src/util/modfile.zig +++ b/src/util/modfile.zig @@ -79,7 +79,7 @@ pub const ModFile = struct { var main = item.mapping.get_string("main"); if (item.mapping.get("src")) |val| { - var src_iter = std.mem.tokenize(val.string, " "); + var src_iter = std.mem.tokenize(u8, val.string, " "); dtype = src_iter.next().?; path = src_iter.next().?; if (src_iter.next()) |dver| { diff --git a/zigmod.lock b/zigmod.lock index d1cbe30964314fd0637395d158a89062f176108b..c03fc1040e04959bee6be477dff10d9965dc1004 100644 --- a/zigmod.lock +++ b/zigmod.lock @@ -1,10 +1,10 @@ 2 git https://github.com/yaml/libyaml tag-0.2.5 git https://github.com/nektro/zig-ansi commit-d4a53bcac5b87abecc65491109ec22aaf5f3dc2f -git https://github.com/ziglibs/known-folders commit-f5e5fb8370de41fbc220c0c0770d62bdf00530ea +git https://github.com/ziglibs/known-folders commit-234b589d3cd0c00f2f675f98fd9674e208fd2bd0 git https://github.com/nektro/zig-licenses commit-c9b8cbf3565675a056ad4e9b57cb4f84020e7680 git https://github.com/truemedian/zfetch commit-8bbc7b34cd417794841e1432585334bc969dfe83 -git https://github.com/truemedian/hzzp commit-2d30bddae3bf1eaecde5144490307604efe76f2a +git https://github.com/truemedian/hzzp commit-ca50ca11c53506ad6c084abbdf082d1d45095222 git https://github.com/alexnask/iguanaTLS commit-0d39a361639ad5469f8e4dcdaea35446bbe54b48 git https://github.com/MasterQ32/zig-network commit-b9c91769d8ebd626c8e45b2abb05cbc28ccc50da git https://github.com/MasterQ32/zig-uri commit-52cdd2061bec0579519f0d30280597f3a1db8b75 @@ -14,6 +14,6 @@ git https://github.com/nektro/zig-detect-license commit-d4544410f811c402b866f21f git https://github.com/nektro/zig-licenses-text commit-3c07c6e4eb0965dafd0b029c632f823631b3169c git https://github.com/nektro/zig-leven commit-8e9f827117ab1418578b692a2325754cc3ee692d git https://github.com/nektro/zig-fs-check commit-dcd8da90fcb8bf3c9887e713bf0ec072bc897dd5 -git https://github.com/nektro/zig-inquirer commit-00f5c71e9dda6c35d478aead9da569c02f3f8db0 +git https://github.com/nektro/zig-inquirer commit-9a068122c59ac2785f330c37bf4412aed644ed37 git https://github.com/arqv/ini commit-e5296e929513eb3d86a5f815c4a4a5ecd4d8d11c -git https://github.com/marlersoft/zigwin32 commit-ca6b8e5c378e31655fa11b886b44b62f703ef090 +git https://github.com/marlersoft/zigwin32 commit-aa954945e3f78ba149ff3828d151f54b4fc5ce0d