diff options
| author | Andrew Kelley <superjoe30@gmail.com> | 2017-12-26 21:44:08 -0500 |
|---|---|---|
| committer | Andrew Kelley <superjoe30@gmail.com> | 2017-12-26 21:44:08 -0500 |
| commit | 6bfaf262d5a1d18482a813c7022ffb03a18f52a8 (patch) | |
| tree | 7f432e8f386aed17df3f1bccdff34ec58b3ff2af /std/array_list.zig | |
| parent | 8b716f941dbd43936a994a008aec9cd21d0b08f2 (diff) | |
| parent | 08dd1b553b37de24eaf24a37558b0f9993d4ca42 (diff) | |
| download | zig-6bfaf262d5a1d18482a813c7022ffb03a18f52a8.tar.gz zig-6bfaf262d5a1d18482a813c7022ffb03a18f52a8.zip | |
Merge branch 'master' into llvm6
Diffstat (limited to 'std/array_list.zig')
| -rw-r--r-- | std/array_list.zig | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/std/array_list.zig b/std/array_list.zig index 04db4dd280..db5581dc08 100644 --- a/std/array_list.zig +++ b/std/array_list.zig @@ -1,6 +1,7 @@ -const debug = @import("debug.zig"); +const std = @import("index.zig"); +const debug = std.debug; const assert = debug.assert; -const mem = @import("mem.zig"); +const mem = std.mem; const Allocator = mem.Allocator; pub fn ArrayList(comptime T: type) -> type { |