From f45dbf85435f6fc4557aecf575d0587c498fe20e Mon Sep 17 00:00:00 2001 From: Meghan Denny Date: Tue, 2 Mar 2021 17:13:42 -0800 Subject: [PATCH] update to zig master 0.8.0-dev.1385+3dd8396a5 --- .circleci/config.yml | 2 +- README.md | 3 +-- docs/README.md | 2 +- src/cmd/fetch.zig | 14 +++++++------- src/util/funcs.zig | 2 +- src/util/module.zig | 2 +- 6 files changed, 12 insertions(+), 13 deletions(-) diff --git a/.circleci/config.yml b/.circleci/config.yml index 3c95f1ded5cc3370cda340d0c9b61d0c746880a0..87ce84a3fc995883519a6aaa422b0f9f94c58810 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.8.0-dev.1158+0aef1faa8 + - run: ./download_zig.sh 0.8.0-dev.1385+3dd8396a5 - run: zig version - run: zig env - run: zig build -Dbootstrap diff --git a/README.md b/README.md index 361ba2451d7a71073bc9a83d8420fa8d06f3d949..7d57164f1cba5ce115a126992b48baa63ed44830 100644 --- a/README.md +++ b/README.md @@ -17,8 +17,7 @@ A package manager for the Zig programming language. - https://github.com/nektro/zigmod/releases ## Built With -- Zig master -- `0.8.0-dev.1158+0aef1faa8` +- Zig master `0.8.0-dev.1385+3dd8396a5` ### Build from Source Initially, diff --git a/docs/README.md b/docs/README.md index 826b7614f35747010aba6fb8d83d4373399279d5..36f78ac07d3d0a93c2e6380cc705c6a1fb7222d6 100644 --- a/docs/README.md +++ b/docs/README.md @@ -8,7 +8,7 @@ You can learn more about Zig here: 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.8.0-dev.1158+0aef1faa8`. +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.8.0-dev.1385+3dd8396a5`. ## Download You may download a precompiled binary from https://github.com/nektro/zigmod/releases or build the project from source. diff --git a/src/cmd/fetch.zig b/src/cmd/fetch.zig index 2b29162c27ef43d1020eb5fdb5142aaeb23f8f6d..59315d5ca8f7072ca1eb580f59157bf5c71a2fba 100644 --- a/src/cmd/fetch.zig +++ b/src/cmd/fetch.zig @@ -26,7 +26,7 @@ pub fn execute(args: [][]u8) !void { try w.writeAll("const std = @import(\"std\");\n"); try w.writeAll("const build = std.build;\n"); try w.writeAll("\n"); - try w.print("pub const cache = \"{s}\";\n", .{std.zig.fmtEscapes(dir)}); + try w.print("pub const cache = \"{}\";\n", .{std.zig.fmtEscapes(dir)}); try w.writeAll("\n"); try w.print("{s}\n", .{ \\pub fn addAllTo(exe: *build.LibExeObjStep) void { @@ -118,7 +118,7 @@ fn print_paths(w: fs.File.Writer, list: []u.Module) !void { try w.print(" \"\",\n", .{}); } else { const s = std.fs.path.sep_str; - try w.print(" \"{s}{s}{s}\",\n", .{std.zig.fmtEscapes(s), std.zig.fmtEscapes(mod.clean_path), std.zig.fmtEscapes(s)}); + try w.print(" \"{}{}{}\",\n", .{std.zig.fmtEscapes(s), std.zig.fmtEscapes(mod.clean_path), std.zig.fmtEscapes(s)}); } } } @@ -156,9 +156,9 @@ fn print_incl_dirs_to(w: fs.File.Writer, list: []u.Module) !void { } for (mod.c_include_dirs) |it| { if (i > 0) { - try w.print(" cache ++ _paths[{}] ++ \"{s}\",\n", .{i, std.zig.fmtEscapes(it)}); + try w.print(" cache ++ _paths[{}] ++ \"{}\",\n", .{i, std.zig.fmtEscapes(it)}); } else { - try w.print(" \"{s}\",\n", .{std.zig.fmtEscapes(it)}); + try w.print(" \"{}\",\n", .{std.zig.fmtEscapes(it)}); } } } @@ -173,7 +173,7 @@ fn print_csrc_dirs_to(w: fs.File.Writer, list: []u.Module) !void { if (i > 0) { try w.print(" {s}_ids[{}], cache ++ _paths[{}] ++ \"{s}\"{s},\n", .{"[_][]const u8{", i, i, it, "}"}); } else { - try w.print(" {s}_ids[{}], \".{s}/{s}\"{s},\n", .{"[_][]const u8{", i, std.zig.fmtEscapes(mod.clean_path), it, "}"}); + try w.print(" {s}_ids[{}], \".{}/{s}\"{s},\n", .{"[_][]const u8{", i, std.zig.fmtEscapes(mod.clean_path), it, "}"}); } } } @@ -189,7 +189,7 @@ fn print_csrc_flags_to(w: fs.File.Writer, list: []u.Module) !void { } try w.print(" pub const @\"{s}\" = {s}", .{mod.id, "&.{"}); for (mod.c_source_flags) |it| { - try w.print("\"{s}\",", .{std.zig.fmtEscapes(it)}); + try w.print("\"{}\",", .{std.zig.fmtEscapes(it)}); } try w.print("{s};\n", .{"}"}); @@ -210,7 +210,7 @@ fn print_pkg_data_to(w: fs.File.Writer, list: *std.ArrayList(u.Module), list2: * while (i < list.items.len) : (i += 1) { const mod = list.items[i]; if (contains_all(mod.deps, list2)) { - try w.print(" pub const _{s} = build.Pkg{{ .name = \"{s}\", .path = cache ++ \"/{s}/{s}\", .dependencies = &[_]build.Pkg{{", .{mod.id, mod.name, std.zig.fmtEscapes(mod.clean_path), mod.main}); + try w.print(" pub const _{s} = build.Pkg{{ .name = \"{s}\", .path = cache ++ \"/{}/{s}\", .dependencies = &[_]build.Pkg{{", .{mod.id, mod.name, std.zig.fmtEscapes(mod.clean_path), mod.main}); for (mod.deps) |d| { if (d.main.len > 0) { try w.print(" _{s},", .{d.id}); diff --git a/src/util/funcs.zig b/src/util/funcs.zig index bea66f3b682ad79611ea2646218fea20d821e4fd..aac2980e6ba6e5953e3f24b4101853f1edb8bff4 100644 --- a/src/util/funcs.zig +++ b/src/util/funcs.zig @@ -275,6 +275,6 @@ pub fn do_hash(comptime algo: type, data: []const u8) ![]const u8 { var out: [algo.digest_length]u8 = undefined; h.update(data); h.final(&out); - const hex = try std.fmt.allocPrint(gpa, "{x}", .{out}); + const hex = try std.fmt.allocPrint(gpa, "{x}", .{std.fmt.fmtSliceHexLower(out[0..])}); return hex; } diff --git a/src/util/module.zig b/src/util/module.zig index d57a06537b817bca9515158a4e3383b897626872..de3236ccba21053361663521ef285b8a04c58481 100644 --- a/src/util/module.zig +++ b/src/util/module.zig @@ -72,7 +72,7 @@ pub const Module = struct { } var out: [32]u8 = undefined; h.final(&out); - const hex = try std.fmt.allocPrint(gpa, "blake3-{x}", .{out}); + const hex = try std.fmt.allocPrint(gpa, "blake3-{x}", .{std.fmt.fmtSliceHexLower(out[0..])}); return hex; } -- 2.54.0