Skip to content

Commit

Permalink
build: Update de imports to use internal packages
Browse files Browse the repository at this point in the history
  • Loading branch information
ibokuri committed Jan 20, 2024
1 parent b9db749 commit eea6f61
Show file tree
Hide file tree
Showing 10 changed files with 23 additions and 21 deletions.
22 changes: 12 additions & 10 deletions build.zig
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ pub fn build(b: *std.Build) void {
{
const test_all_step = b.step("test", "Run tests");
const test_ser_step = b.step("test-ser", "Run serialization tests");
//const test_de_step = b.step("test-de", "Run deserialization tests");
const test_de_step = b.step("test-de", "Run deserialization tests");

// Serialization tests.
const t_ser = b.addTest(.{
Expand All @@ -55,15 +55,17 @@ pub fn build(b: *std.Build) void {
test_all_step.dependOn(test_ser_step);

// Deserialization tests.
//const t_de = b.addTest(.{
//.name = "deserialization test",
//.root_source_file = .{ .path = "src/de/de.zig" },
//.target = target,
//.optimize = optimize,
//});
//t_de.root_module.addImport("protest", protest_module);
//test_de_step.dependOn(&b.addRunArtifact(t_de).step);
//test_all_step.dependOn(test_de_step);
const t_de = b.addTest(.{
.name = "deserialization test",
.root_source_file = .{ .path = "src/de/de.zig" },
.target = target,
.optimize = optimize,
});
inline for (imports) |imp| {
t_de.root_module.addImport(imp.name, imp.module);
}
test_de_step.dependOn(&b.addRunArtifact(t_de).step);
test_all_step.dependOn(test_de_step);
}

// Documentation.
Expand Down
4 changes: 2 additions & 2 deletions src/de/attributes.zig
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@ const require = @import("protest").require;
const std = @import("std");

const dt = @import("tuples.zig").dt;
const has_attributes = @import("../attributes.zig").has_attributes;
const has_block = @import("../block.zig").has_block;
const has_attributes = @import("attr").has_attributes;
const has_block = @import("block").has_block;
const t = @import("testing.zig");

/// Returns deserialization attributes for `T`. If none exist, `null` is returned.
Expand Down
4 changes: 2 additions & 2 deletions src/de/blocks/pointer.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ const std = @import("std");

const blocks = @import("../blocks.zig");
const find_db = @import("../find.zig").find_db;
const has_attributes = @import("../../attributes.zig").has_attributes;
const has_attributes = @import("attr").has_attributes;
const Ignored = @import("../impls/seed/ignored.zig").Ignored;
const isString = @import("../../helpers.zig").isString;
const isString = @import("helpers").isString;
const PointerVisitor = @import("../impls/visitor/pointer.zig").Visitor;
const testing = @import("../testing.zig");
const VisitorInterface = @import("../interfaces/visitor.zig").Visitor;
Expand Down
2 changes: 1 addition & 1 deletion src/de/blocks/slice.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const require = @import("protest").require;
const std = @import("std");

const isString = @import("../../helpers.zig").isString;
const isString = @import("helpers").isString;
const SliceVisitor = @import("../impls/visitor/slice.zig").Visitor;
const testing = @import("../testing.zig");

Expand Down
2 changes: 1 addition & 1 deletion src/de/blocks/union.zig
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ const ContentDeserializer = @import("../impls/deserializer/content.zig").Content
const getAttributes = @import("../attributes.zig").getAttributes;
const getty_deserialize = @import("../deserialize.zig").deserialize;
const getty_error = @import("../error.zig").Error;
const Tag = @import("../../attributes.zig").Tag;
const Tag = @import("attr").Tag;
const testing = @import("../testing.zig");
const UnionAccessInterface = @import("../interfaces/union_access.zig").UnionAccess;
const UnionVisitor = @import("../impls/visitor/union.zig").Visitor;
Expand Down
2 changes: 1 addition & 1 deletion src/de/deserialize.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const require = @import("protest").require;
const std = @import("std");

const attributes = @import("../attributes.zig");
const attributes = @import("attr");
const blocks = @import("blocks.zig");
const find_db = @import("find.zig").find_db;
const Ignored = @import("impls/seed/ignored.zig").Ignored;
Expand Down
2 changes: 1 addition & 1 deletion src/de/find.zig
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
const dt = @import("tuples.zig").dt;
const has_block = @import("../block.zig").has_block;
const has_block = @import("block").has_block;

/// Returns the highest priority Deserialization Block for a type.
pub fn find_db(
Expand Down
2 changes: 1 addition & 1 deletion src/de/impls/visitor/pointer.zig
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ const std = @import("std");

const blocks = @import("../../blocks.zig");
const find_db = @import("../../find.zig").find_db;
const has_attributes = @import("../../../attributes.zig").has_attributes;
const has_attributes = @import("attr").has_attributes;
const StringLifetime = @import("../../lifetime.zig").StringLifetime;
const VisitorInterface = @import("../../interfaces/visitor.zig").Visitor;
const VisitStringReturn = @import("../../interfaces/visitor.zig").VisitStringReturn;
Expand Down
2 changes: 1 addition & 1 deletion src/de/interfaces/visitor.zig
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
const std = @import("std");
const assert = std.debug.assert;

const isString = @import("../../helpers.zig").isString;
const isString = @import("helpers").isString;
const StringLifetime = @import("../lifetime.zig").StringLifetime;

/// A `Visitor` deserializes values from Getty's data model into Zig.
Expand Down
2 changes: 1 addition & 1 deletion src/de/testing.zig
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ const MapAccessInterface = @import("interfaces/map_access.zig").MapAccess;
const Result = @import("deserialize.zig").Result;
const SeqAccessInterface = @import("interfaces/seq_access.zig").SeqAccess;
const StringLifetime = @import("lifetime.zig").StringLifetime;
const testing = @import("../testing.zig");
const testing = @import("testing");
const Token = testing.Token;
const UnionAccessInterface = @import("interfaces/union_access.zig").UnionAccess;
const VariantAccessInterface = @import("interfaces/variant_access.zig").VariantAccess;
Expand Down

0 comments on commit eea6f61

Please sign in to comment.