Skip to content

Move to Unmanaged for 0.16 release #27

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
PauSolerValades wants to merge 5 commits into
base: main
Choose a base branch
from
Open

Move to Unmanaged for 0.16 release #27

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1a253ff
Removed inecessary allocations in the smthUpdate fields
PauSolerValades Feb 20, 2026
7baf0a4
Started with the bitset implementation
PauSolerValades Feb 21, 2026
b47c9a6
Removed managed variants
PauSolerValades Feb 25, 2026
78f49a7
added .empty and initContext
PauSolerValades Feb 25, 2026
fd8f144
Refactored tests with the .empty and :Self inside the functions
PauSolerValades Feb 25, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
78 changes: 42 additions & 36 deletions src/array_hash_set/unmanaged.zig → src/array_hash_set.zig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ fn selectMap(comptime E: type) type {
}
}

pub fn ArraySetUnmanaged(comptime E: type) type {
pub fn ArraySet(comptime E: type) type {
return struct {
/// The type of the internal hash map
pub const Map = selectMap(E);
Expand Down Expand Up @@ -69,19 +69,25 @@ pub fn ArraySetUnmanaged(comptime E: type) type {
};

const Self = @This();

pub fn init() Self {
return .{
.unmanaged = Map{},
};
}

pub const empty: Self = .{
.unmanaged = Map{},
};

// pub fn init() Self {
// return .{
// .unmanaged = Map{},
// };
// }

pub fn initCapacity(allocator: Allocator, num: Size) Allocator.Error!Self {
var self = Self.init();
var self: Self = .empty;
try self.unmanaged.ensureTotalCapacity(allocator, num);
return self;
}

/// TODO: zig has still not changed neither of the two maps from selectMap 0.16,
/// so we need to pass the allocator to deinit that.
pub fn deinit(self: *Self, allocator: Allocator) void {
self.unmanaged.deinit(allocator);
self.* = undefined;
Expand Down Expand Up @@ -185,7 +191,7 @@ pub fn ArraySetUnmanaged(comptime E: type) type {
///
/// Caller owns the newly allocated/returned set.
pub fn differenceOf(self: Self, allocator: Allocator, other: Self) Allocator.Error!Self {
var diffSet = Self.init();
var diffSet: Self = .empty;

var iter = self.unmanaged.iterator();
while (iter.next()) |entry| {
Expand Down Expand Up @@ -256,7 +262,7 @@ pub fn ArraySetUnmanaged(comptime E: type) type {
///
/// Caller owns the newly allocated/returned set.
pub fn intersectionOf(self: Self, allocator: Allocator, other: Self) Allocator.Error!Self {
var interSet = Self.init();
var interSet: Self = .empty;

// Optimization: iterate over whichever set is smaller.
// Matters when disparity in cardinality is large.
Expand Down Expand Up @@ -413,7 +419,7 @@ pub fn ArraySetUnmanaged(comptime E: type) type {
///
/// The caller owns the newly allocated/returned Set.
pub fn symmetricDifferenceOf(self: Self, allocator: Allocator, other: Self) Allocator.Error!Self {
var sdSet = Self.init();
var sdSet: Self = .empty;

var iter = self.unmanaged.iterator();
while (iter.next()) |entry| {
Expand Down Expand Up @@ -496,7 +502,7 @@ const expectEqual = std.testing.expectEqual;

test "example usage" {
// Create a set of u32s called A
var A = ArraySetUnmanaged(u32).init();
var A: ArraySet(u32) = .empty;
defer A.deinit(testing.allocator);

// Add some data
Expand All @@ -508,7 +514,7 @@ test "example usage" {
_ = try A.appendSlice(testing.allocator, &.{ 5, 3, 0, 9 });

// Create another set called B
var B = ArraySetUnmanaged(u32).init();
var B: ArraySet(u32) = .empty;
defer B.deinit(testing.allocator);

// Add data to B
Expand All @@ -533,10 +539,10 @@ test "example usage" {
}

test "string usage" {
var A = ArraySetUnmanaged([]const u8).init();
var A: ArraySet([]const u8) = .empty;
defer A.deinit(testing.allocator);

var B = ArraySetUnmanaged([]const u8).init();
var B: ArraySet([]const u8) = .empty;
defer B.deinit(testing.allocator);

_ = try A.add(testing.allocator, "Hello");
Expand All @@ -549,7 +555,7 @@ test "string usage" {
}

test "comprehensive usage" {
var set = ArraySetUnmanaged(u32).init();
var set: ArraySet(u32) = .empty;
defer set.deinit(testing.allocator);

try expect(set.isEmpty());
Expand All @@ -573,7 +579,7 @@ test "comprehensive usage" {

try expectEqual(set.cardinality(), 7);

var other = ArraySetUnmanaged(u32).init();
var other: ArraySet(u32) = .empty;
defer other.deinit(testing.allocator);

try expect(other.isEmpty());
Expand Down Expand Up @@ -632,11 +638,11 @@ test "comprehensive usage" {
}

test "isDisjoint" {
var a = ArraySetUnmanaged(u32).init();
var a: ArraySet(u32) = .empty;
defer a.deinit(testing.allocator);
_ = try a.appendSlice(testing.allocator, &.{ 20, 30, 40 });

var b = ArraySetUnmanaged(u32).init();
var b: ArraySet(u32) = .empty;
defer b.deinit(testing.allocator);
_ = try b.appendSlice(testing.allocator, &.{ 202, 303, 403 });

Expand All @@ -645,7 +651,7 @@ test "isDisjoint" {
try expect(b.isDisjoint(a));

// Test the false case.
var c = ArraySetUnmanaged(u32).init();
var c: ArraySet(u32) = .empty;
defer c.deinit(testing.allocator);
_ = try c.appendSlice(testing.allocator, &.{ 20, 30, 400 });

Expand All @@ -656,7 +662,7 @@ test "isDisjoint" {
test "clone" {

// clone
var a = ArraySetUnmanaged(u32).init();
var a: ArraySet(u32) = .empty;
defer a.deinit(testing.allocator);
_ = try a.appendSlice(testing.allocator, &.{ 20, 30, 40 });

Expand All @@ -667,14 +673,14 @@ test "clone" {
}

test "clear/capacity" {
var a = ArraySetUnmanaged(u32).init();
var a: ArraySet(u32) = .empty;
defer a.deinit(testing.allocator);

try expectEqual(0, a.cardinality());
try expectEqual(0, a.capacity());

const cap = 99;
var b = try ArraySetUnmanaged(u32).initCapacity(testing.allocator, cap);
var b = try ArraySet(u32).initCapacity(testing.allocator, cap);
defer b.deinit(testing.allocator);

try expectEqual(0, b.cardinality());
Expand All @@ -699,7 +705,7 @@ test "clear/capacity" {
}

test "iterator" {
var a = ArraySetUnmanaged(u32).init();
var a: ArraySet(u32) = .empty;
defer a.deinit(testing.allocator);
_ = try a.appendSlice(testing.allocator, &.{ 20, 30, 40 });

Expand All @@ -716,7 +722,7 @@ test "iterator" {
}

test "pop" {
var a = ArraySetUnmanaged(u32).init();
var a: ArraySet(u32) = .empty;
defer a.deinit(testing.allocator);
_ = try a.appendSlice(testing.allocator, &.{ 20, 30, 40 });

Expand All @@ -735,11 +741,11 @@ test "pop" {

test "in-place methods" {
// intersectionUpdate
var a = ArraySetUnmanaged(u32).init();
var a: ArraySet(u32) = .empty;
defer a.deinit(testing.allocator);
_ = try a.appendSlice(testing.allocator, &.{ 10, 20, 30, 40 });

var b = ArraySetUnmanaged(u32).init();
var b: ArraySet(u32) = .empty;
defer b.deinit(testing.allocator);
_ = try b.appendSlice(testing.allocator, &.{ 44, 20, 30, 66 });

Expand All @@ -748,11 +754,11 @@ test "in-place methods" {
try expect(a.containsAllSlice(&.{ 20, 30 }));

// unionUpdate
var c = ArraySetUnmanaged(u32).init();
var c: ArraySet(u32) = .empty;
defer c.deinit(testing.allocator);
_ = try c.appendSlice(testing.allocator, &.{ 10, 20, 30, 40 });

var d = ArraySetUnmanaged(u32).init();
var d: ArraySet(u32) = .empty;
defer d.deinit(testing.allocator);
_ = try d.appendSlice(testing.allocator, &.{ 44, 20, 30, 66 });

Expand All @@ -761,11 +767,11 @@ test "in-place methods" {
try expect(c.containsAllSlice(&.{ 10, 20, 30, 40, 66 }));

// differenceUpdate
var e = ArraySetUnmanaged(u32).init();
var e: ArraySet(u32) = .empty;
defer e.deinit(testing.allocator);
_ = try e.appendSlice(testing.allocator, &.{ 1, 11, 111, 1111, 11111 });

var f = ArraySetUnmanaged(u32).init();
var f: ArraySet(u32) = .empty;
defer f.deinit(testing.allocator);
_ = try f.appendSlice(testing.allocator, &.{ 1, 11, 111, 222, 2222, 1111 });

Expand All @@ -775,11 +781,11 @@ test "in-place methods" {
try expect(e.contains(11111));

// symmetricDifferenceUpdate
var g = ArraySetUnmanaged(u32).init();
var g: ArraySet(u32) = .empty;
defer g.deinit(testing.allocator);
_ = try g.appendSlice(testing.allocator, &.{ 2, 22, 222, 2222, 22222 });

var h = ArraySetUnmanaged(u32).init();
var h: ArraySet(u32) = .empty;
defer h.deinit(testing.allocator);
_ = try h.appendSlice(testing.allocator, &.{ 1, 11, 111, 333, 3333, 2222, 1111 });

Expand All @@ -790,7 +796,7 @@ test "in-place methods" {
}

test "removals" {
var a = ArraySetUnmanaged(u32).init();
var a: ArraySet(u32) = .empty;
defer a.deinit(testing.allocator);

_ = try a.appendSlice(testing.allocator, &.{ 5, 6, 7, 8 });
Expand All @@ -809,7 +815,7 @@ test "removals" {
a.removeAllSlice(&.{ 50, 60, 70, 80 });
try expectEqual(4, a.cardinality());

var b = ArraySetUnmanaged(u32).init();
var b: ArraySet(u32) = .empty;
defer b.deinit(testing.allocator);

_ = try b.appendSlice(testing.allocator, &.{ 111, 222, 333, 444 });
Expand All @@ -822,5 +828,5 @@ test "sizeOf matches" {
// No bloat guarantee, after all we're just building on top of what's good.
const expectedByteSize = 40;
try expectEqual(expectedByteSize, @sizeOf(std.array_hash_map.AutoArrayHashMapUnmanaged(u32, void)));
try expectEqual(expectedByteSize, @sizeOf(ArraySetUnmanaged(u32)));
try expectEqual(expectedByteSize, @sizeOf(ArraySet(u32)));
}
Loading