diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2018-07-14 18:27:51 -0400 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2018-07-14 18:27:51 -0400 |
| commit | 4d920cee6e8be2f2ae2cfd9067358c65b977568a (patch) | |
| tree | 2c04de6151b7448dec9958d0a91234ea0ba9a15d /std/event.zig | |
| parent | da3acacc14331a6be33445c3bfd204e2cccabddd (diff) | |
| parent | 28c3d4809bc6d497ac81892bc7eb03b95d8c2b32 (diff) | |
| download | zig-4d920cee6e8be2f2ae2cfd9067358c65b977568a.tar.gz zig-4d920cee6e8be2f2ae2cfd9067358c65b977568a.zip | |
Merge remote-tracking branch 'origin/master' into llvm7
Diffstat (limited to 'std/event.zig')
| -rw-r--r-- | std/event.zig | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/std/event.zig b/std/event.zig index 7e9928b3d7..1e52086286 100644 --- a/std/event.zig +++ b/std/event.zig @@ -3,6 +3,8 @@ pub const Loop = @import("event/loop.zig").Loop; pub const Lock = @import("event/lock.zig").Lock; pub const tcp = @import("event/tcp.zig"); pub const Channel = @import("event/channel.zig").Channel; +pub const Group = @import("event/group.zig").Group; +pub const Future = @import("event/future.zig").Future; test "import event tests" { _ = @import("event/locked.zig"); @@ -10,4 +12,6 @@ test "import event tests" { _ = @import("event/lock.zig"); _ = @import("event/tcp.zig"); _ = @import("event/channel.zig"); + _ = @import("event/group.zig"); + _ = @import("event/future.zig"); } |