Skip to content

Commit 0268acc

Browse files
committed
passing zig-0.15
1 parent 9f25aa1 commit 0268acc

4 files changed

Lines changed: 22 additions & 20 deletions

File tree

build.zig

Lines changed: 18 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,13 @@
11
const std = @import("std");
2+
const Build = std.Build;
23
const ArrayListManaged = std.array_list.Managed;
3-
pub fn build(b: *std.Build) !void {
4-
@setEvalBranchQuota(100000);
4+
pub fn build(b: *Build) !void {
55
const target = b.standardTargetOptions(.{});
66
const optimize = b.standardOptimizeOption(.{});
77

88
const lib = b.addLibrary(.{
99
.name = "jetquery",
10+
.linkage = .static,
1011
.root_module = b.createModule(.{
1112
.root_source_file = b.path("src/jetquery.zig"),
1213
.target = target,
@@ -21,7 +22,11 @@ pub fn build(b: *std.Build) !void {
2122
.optimize = optimize,
2223
.openssl_lib_name = "ssl",
2324
});
24-
const jetcommon_dep = b.dependency("jetcommon", .{ .target = target, .optimize = optimize });
25+
26+
const jetcommon_dep = b.dependency("jetcommon", .{
27+
.target = target,
28+
.optimize = optimize,
29+
});
2530
const jetcommon_module = jetcommon_dep.module("jetcommon");
2631

2732
lib.root_module.addImport("pg", pg_dep.module("pg"));
@@ -126,19 +131,17 @@ pub fn build(b: *std.Build) !void {
126131
run_generate_seeders_cmd.addFileArg(.{ .cwd_relative = path });
127132
}
128133

129-
const jetquery_migrate_module = b.addModule(
130-
"jetquery_migrate",
131-
.{ .root_source_file = b.path("src/jetquery/Migrate.zig") },
132-
);
134+
const jetquery_migrate_module = b.addModule("jetquery_migrate", .{
135+
.root_source_file = b.path("src/jetquery/Migrate.zig"),
136+
});
133137
jetquery_migrate_module.addImport("jetquery", jetquery_module);
134138
jetquery_migrate_module.addImport("migrations", migrations_module);
135139
jetquery_migrate_module.addImport("jetquery.config", config_module);
136140
jetquery_migrate_module.addImport("jetcommon", jetcommon_module);
137141

138-
const seeders_module = b.addModule(
139-
"jetquery_seeders",
140-
.{ .root_source_file = generated_seeders_path },
141-
);
142+
const seeders_module = b.addModule("jetquery_seeders", .{
143+
.root_source_file = generated_seeders_path,
144+
});
142145
seeders_module.addImport("jetquery", jetquery_module);
143146
seeders_module.addImport("jetquery.config", config_module);
144147
seed_unit_tests.root_module.addImport("migrations", migrations_module);
@@ -147,10 +150,9 @@ pub fn build(b: *std.Build) !void {
147150
seed_unit_tests.root_module.addImport("jetquery", jetquery_module);
148151
seed_unit_tests.root_module.addImport("jetcommon", jetcommon_module);
149152

150-
const jetquery_seeder_module = b.addModule(
151-
"jetquery_seeder",
152-
.{ .root_source_file = b.path("src/jetquery/Seed.zig") },
153-
);
153+
const jetquery_seeder_module = b.addModule("jetquery_seeder", .{
154+
.root_source_file = b.path("src/jetquery/Seed.zig"),
155+
});
154156
jetquery_seeder_module.addImport("jetquery", jetquery_module);
155157
jetquery_seeder_module.addImport("seeders", seeders_module);
156158
jetquery_seeder_module.addImport("jetquery.config", config_module);
@@ -198,7 +200,7 @@ fn findFilesSorted(allocator: std.mem.Allocator, path: []const u8) ![][]const u8
198200
};
199201
defer dir.close();
200202

201-
var files = ArrayListManaged([]const u8).init(allocator);
203+
var files: ArrayListManaged([]const u8) = .init(allocator);
202204

203205
var it = dir.iterate();
204206
while (try it.next()) |entry| {

build.zig.zon

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,8 @@
55
.minimum_zig_version = "0.15.1",
66
.dependencies = .{
77
.jetcommon = .{
8-
.url = "https://github.com/jetzig-framework/jetcommon/archive/f613f2cb9084d4b1c19ea89f5dab9ad7ba4fa3c4.tar.gz",
9-
.hash = "jetcommon-0.1.0-jPY_DRRJAADaN4sQby3c31hyFSAgqIP90D4DYcTNVquG",
8+
.url = "https://github.com/jetzig-framework/jetcommon/archive/da50c67de931bcfe68dc54633b406315152e0c60.tar.gz",
9+
.hash = "jetcommon-0.1.0-jPY_DdhIAAAk0zqZQf6adpaL5s2g115R8TDZ9j-VboCO",
1010
},
1111
.pg = .{
1212
.url = "https://github.com/karlseguin/pg.zig/archive/4c2602bad095f9d85b16711d12aa3a2bc7e169cc.tar.gz",

src/jetquery/reflection/Reflect.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ pub fn Reflect(adapter_name: jetquery.adapters.Name, Schema: type) type {
6666
try writeModel(allocator, Schema, reflection, table, writer);
6767
}
6868

69-
return try self.allocator.dupe(u8, try jetcommon.fmt.zig(
69+
return self.allocator.dupe(u8, try jetcommon.fmt.zig(
7070
allocator,
7171
buf.items,
7272
"Found errors in generated schema.",

src/jetquery/reflection/util.zig

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -77,6 +77,6 @@ pub fn zigEscape(
7777
.string => std.zig.fmtString(input),
7878
};
7979

80-
try writer.print("{any}", .{formatter});
80+
try writer.print("{f}", .{formatter});
8181
return try buf.toOwnedSlice();
8282
}

0 commit comments

Comments
 (0)