diff options
| author | Andrew Kelley <andrew@ziglang.org> | 2020-10-08 15:47:45 -0700 |
|---|---|---|
| committer | Andrew Kelley <andrew@ziglang.org> | 2020-10-08 15:47:45 -0700 |
| commit | 8b7539bd9554d25599ccff6f0e9ea79aa051946b (patch) | |
| tree | 9157fafcbe37f904346fd73042be1d1d299d4da2 /lib/std/event.zig | |
| parent | b5a36f676b1fd69f195d9f1eb6e35f3eb2f15946 (diff) | |
| parent | b02341d6f58e0b8a87fc2ab589dcfd85e5dc96cd (diff) | |
| download | zig-8b7539bd9554d25599ccff6f0e9ea79aa051946b.tar.gz zig-8b7539bd9554d25599ccff6f0e9ea79aa051946b.zip | |
Merge remote-tracking branch 'origin/master' into llvm11
Conflicts:
src/clang.zig
Master branch renamed an enum; this branch gave it an explicit tag type
and explicitly initialized values. This commit combines the changes
together.
Diffstat (limited to 'lib/std/event.zig')
| -rw-r--r-- | lib/std/event.zig | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/lib/std/event.zig b/lib/std/event.zig index 42f3176a1b..eeee8be65b 100644 --- a/lib/std/event.zig +++ b/lib/std/event.zig @@ -12,6 +12,7 @@ pub const Locked = @import("event/locked.zig").Locked; pub const RwLock = @import("event/rwlock.zig").RwLock; pub const RwLocked = @import("event/rwlocked.zig").RwLocked; pub const Loop = @import("event/loop.zig").Loop; +pub const WaitGroup = @import("event/WaitGroup.zig").WaitGroup; test "import event tests" { _ = @import("event/channel.zig"); @@ -23,4 +24,5 @@ test "import event tests" { _ = @import("event/rwlock.zig"); _ = @import("event/rwlocked.zig"); _ = @import("event/loop.zig"); + _ = @import("event/wait_group.zig"); } |