aboutsummaryrefslogtreecommitdiff
path: root/lib/std/std.zig
diff options
context:
space:
mode:
authorAndrew Kelley <andrew@ziglang.org>2019-10-17 22:08:39 -0400
committerAndrew Kelley <andrew@ziglang.org>2019-10-17 22:08:39 -0400
commite42d86b657c2fae093fb2545e8b4b85614a0c906 (patch)
treee7b0f9f6f509e34edeb2226569b2ae78d34cfb5a /lib/std/std.zig
parent17aa8c3ee29fae4bfbd6acc91eed8d229f627c32 (diff)
parent2d5b2bf1c986d037ef965bf8c9b4d8dfd5967478 (diff)
downloadzig-e42d86b657c2fae093fb2545e8b4b85614a0c906.tar.gz
zig-e42d86b657c2fae093fb2545e8b4b85614a0c906.zip
Merge branch 'lun-4-progress-take-2'
closes #3362
Diffstat (limited to 'lib/std/std.zig')
-rw-r--r--lib/std/std.zig11
1 files changed, 6 insertions, 5 deletions
diff --git a/lib/std/std.zig b/lib/std/std.zig
index f67d0c9320..f41181f6e9 100644
--- a/lib/std/std.zig
+++ b/lib/std/std.zig
@@ -6,20 +6,21 @@ pub const BufMap = @import("buf_map.zig").BufMap;
pub const BufSet = @import("buf_set.zig").BufSet;
pub const Buffer = @import("buffer.zig").Buffer;
pub const BufferOutStream = @import("io.zig").BufferOutStream;
+pub const ChildProcess = @import("child_process.zig").ChildProcess;
pub const DynLib = @import("dynamic_library.zig").DynLib;
pub const HashMap = @import("hash_map.zig").HashMap;
pub const Mutex = @import("mutex.zig").Mutex;
-pub const PackedIntArrayEndian = @import("packed_int_array.zig").PackedIntArrayEndian;
pub const PackedIntArray = @import("packed_int_array.zig").PackedIntArray;
-pub const PackedIntSliceEndian = @import("packed_int_array.zig").PackedIntSliceEndian;
+pub const PackedIntArrayEndian = @import("packed_int_array.zig").PackedIntArrayEndian;
pub const PackedIntSlice = @import("packed_int_array.zig").PackedIntSlice;
+pub const PackedIntSliceEndian = @import("packed_int_array.zig").PackedIntSliceEndian;
pub const PriorityQueue = @import("priority_queue.zig").PriorityQueue;
-pub const SinglyLinkedList = @import("linked_list.zig").SinglyLinkedList;
-pub const StaticallyInitializedMutex = @import("statically_initialized_mutex.zig").StaticallyInitializedMutex;
+pub const Progress = @import("progress.zig").Progress;
pub const SegmentedList = @import("segmented_list.zig").SegmentedList;
+pub const SinglyLinkedList = @import("linked_list.zig").SinglyLinkedList;
pub const SpinLock = @import("spinlock.zig").SpinLock;
+pub const StaticallyInitializedMutex = @import("statically_initialized_mutex.zig").StaticallyInitializedMutex;
pub const StringHashMap = @import("hash_map.zig").StringHashMap;
-pub const ChildProcess = @import("child_process.zig").ChildProcess;
pub const TailQueue = @import("linked_list.zig").TailQueue;
pub const Thread = @import("thread.zig").Thread;