Skip to content

Commit 218326b

Browse files
authored
Merge branch 'deckarep:main' into main
2 parents 95fdeb7 + d632322 commit 218326b

File tree

4 files changed

+9
-13
lines changed

4 files changed

+9
-13
lines changed

.github/workflows/test.yml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -4,13 +4,13 @@ on:
44
push:
55
branches: [ main ]
66
pull_request:
7-
branches: [ main ]
7+
branches: [ "*" ]
88

99
jobs:
1010
test:
1111
runs-on: ubuntu-latest
1212
name: Test
1313
steps:
1414
- uses: actions/checkout@11bd71901bbe5b1630ceea73d27597364c9af683 # v4.2.2
15-
- uses: mlugg/setup-zig@a67e68dc5c8281d9608136d3d7ca1b282213e4ac # v1.2.1
16-
- run: zig build test
15+
- uses: mlugg/setup-zig@v2
16+
- run: zig build test

README.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ This implementation gives credit and acknowledgement to the [Zig language](https
3636
#### Features
3737
* Offers idiomatic, generic-based Zig API - allocator support, iterators, capacity hints, clearing, resizing, etc.
3838
* A few flavors to choose from
39-
* NOTE: Future versions of Zig will be deprecating the `managed` variants, and this repo will be following suit.
39+
* NOTE: Future versions of Zig [will be deprecating the `managed` variants](https://ziglang.org/download/0.14.0/release-notes.html#Embracing-Unmanaged-Style-Containers), and this repo will be following suit.
4040
* Hash-based: everyday usecase, optimized for lookups primarily, insertion/removal secondarily - [further reading](https://devlog.hexops.com/2022/zig-hashmaps-explained/)
4141
* HashSetManaged - initializes with an allocator and holds it internally (built on top of unmanaged)
4242
* HashSetUnmanaged - does not hold an allocator, smaller footprint
@@ -224,4 +224,4 @@ zigup build docs && cp -a zig-out/docs/. docs/
224224

225225
# Alternatively, using Zigup:
226226
zigup run <zig-version> build docs && cp -a zig-out/docs/. docs/
227-
```
227+
```

build.zig

Lines changed: 3 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,17 +6,15 @@ pub fn build(b: *std.Build) void {
66
const optimize = b.standardOptimizeOption(.{});
77
const target = b.standardTargetOptions(.{});
88

9-
_ = b.addModule("ziglangSet", .{
9+
const main_module = b.addModule("ziglangSet", .{
1010
.root_source_file = b.path("src/root.zig"),
1111
.target = target,
1212
.optimize = optimize,
1313
});
1414

1515
const main_tests = b.addTest(.{
1616
.name = "ziglang-set tests",
17-
.root_source_file = b.path("src/root.zig"),
18-
.target = target,
19-
.optimize = optimize,
17+
.root_module = main_module,
2018
});
2119
const run_main_tests = b.addRunArtifact(main_tests);
2220

@@ -26,9 +24,7 @@ pub fn build(b: *std.Build) void {
2624
// Below is for docs generation.
2725
const lib = b.addObject(.{
2826
.name = "ziglang-set",
29-
.root_source_file = b.path("src/root.zig"),
30-
.target = target,
31-
.optimize = optimize,
27+
.root_module = main_module,
3228
});
3329

3430
const my_docs = lib;

build.zig.zon

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
.name = "ziglangSet",
33
.version = "0.0.1",
44
.fingerprint = 0x65aa5acd2ef4855,
5-
.minimum_zig_version = "0.14.0",
5+
.minimum_zig_version = "0.15.1",
66

77
.dependencies = .{},
88

0 commit comments

Comments
 (0)