rename std lib files to new convention

.builds/freebsd.yml

@@ -13,28 +13,28 @@ tasks:
   - test: |
       cd zig/build
       bin/zig test ../test/stage1/behavior.zig
-      bin/zig test ../std/special/compiler_rt/index.zig
+      bin/zig test ../std/special/compiler_rt.zig
 
       bin/zig test ../test/stage1/behavior.zig --library c
-      bin/zig test ../std/special/compiler_rt/index.zig --library c
+      bin/zig test ../std/special/compiler_rt.zig --library c
 
       bin/zig test ../test/stage1/behavior.zig --release-fast
-      bin/zig test ../std/special/compiler_rt/index.zig --release-fast
+      bin/zig test ../std/special/compiler_rt.zig --release-fast
 
       bin/zig test ../test/stage1/behavior.zig --release-fast --library c
-      bin/zig test ../std/special/compiler_rt/index.zig --release-fast --library c
+      bin/zig test ../std/special/compiler_rt.zig --release-fast --library c
 
       bin/zig test ../test/stage1/behavior.zig --release-small --library c
-      bin/zig test ../std/special/compiler_rt/index.zig --release-small --library c
+      bin/zig test ../std/special/compiler_rt.zig --release-small --library c
 
       bin/zig test ../test/stage1/behavior.zig --release-small
-      bin/zig test ../std/special/compiler_rt/index.zig --release-small
+      bin/zig test ../std/special/compiler_rt.zig --release-small
 
       bin/zig test ../test/stage1/behavior.zig --release-safe
-      bin/zig test ../std/special/compiler_rt/index.zig --release-safe
+      bin/zig test ../std/special/compiler_rt.zig --release-safe
 
       bin/zig test ../test/stage1/behavior.zig --release-safe --library c
-      bin/zig test ../std/special/compiler_rt/index.zig --release-safe --library c
+      bin/zig test ../std/special/compiler_rt.zig --release-safe --library c
       # TODO enable all tests
       #bin/zig build --build-file ../build.zig test
       # TODO integrate with the download page updater and make a

CMakeLists.txt

@@ -439,7 +439,7 @@ set(ZIG_CPP_SOURCES
 
 set(ZIG_STD_FILES
     "array_list.zig"
-    "atomic/index.zig"
+    "atomic.zig"
     "atomic/int.zig"
     "atomic/queue.zig"
     "atomic/stack.zig"
@@ -449,17 +449,17 @@ set(ZIG_STD_FILES
     "buffer.zig"
     "build.zig"
     "build/fmt.zig"
+    "c.zig"
     "c/darwin.zig"
     "c/freebsd.zig"
-    "c/index.zig"
     "c/linux.zig"
     "c/netbsd.zig"
     "c/windows.zig"
     "coff.zig"
+    "crypto.zig"
     "crypto/blake2.zig"
     "crypto/chacha20.zig"
     "crypto/hmac.zig"
-    "crypto/index.zig"
     "crypto/md5.zig"
     "crypto/poly1305.zig"
     "crypto/sha1.zig"
@@ -467,8 +467,8 @@ set(ZIG_STD_FILES
     "crypto/sha3.zig"
     "crypto/x25519.zig"
     "cstr.zig"
+    "debug.zig"
     "debug/failing_allocator.zig"
-    "debug/index.zig"
     "dwarf.zig"
     "dynamic_library.zig"
     "elf.zig"
@@ -485,25 +485,25 @@ set(ZIG_STD_FILES
     "event/net.zig"
     "event/rwlock.zig"
     "event/rwlocked.zig"
+    "fmt.zig"
+    "fmt/errol.zig"
     "fmt/errol/enum3.zig"
-    "fmt/errol/index.zig"
     "fmt/errol/lookup.zig"
-    "fmt/index.zig"
     "fmt/parse_float.zig"
+    "hash.zig"
     "hash/adler.zig"
     "hash/crc.zig"
     "hash/fnv.zig"
-    "hash/index.zig"
     "hash/siphash.zig"
     "hash_map.zig"
     "heap.zig"
-    "index.zig"
     "io.zig"
     "io/seekable_stream.zig"
     "json.zig"
     "lazy_init.zig"
     "linked_list.zig"
     "macho.zig"
+    "math.zig"
     "math/acos.zig"
     "math/acosh.zig"
     "math/asin.zig"
@@ -511,10 +511,11 @@ set(ZIG_STD_FILES
     "math/atan.zig"
     "math/atan2.zig"
     "math/atanh.zig"
-    "math/big/index.zig"
+    "math/big.zig"
     "math/big/int.zig"
     "math/cbrt.zig"
     "math/ceil.zig"
+    "math/complex.zig"
     "math/complex/abs.zig"
     "math/complex/acos.zig"
     "math/complex/acosh.zig"
@@ -527,7 +528,6 @@ set(ZIG_STD_FILES
     "math/complex/cos.zig"
     "math/complex/cosh.zig"
     "math/complex/exp.zig"
-    "math/complex/index.zig"
     "math/complex/ldexp.zig"
     "math/complex/log.zig"
     "math/complex/pow.zig"
@@ -550,7 +550,6 @@ set(ZIG_STD_FILES
     "math/frexp.zig"
     "math/hypot.zig"
     "math/ilogb.zig"
-    "math/index.zig"
     "math/inf.zig"
     "math/isfinite.zig"
     "math/isinf.zig"
@@ -575,33 +574,33 @@ set(ZIG_STD_FILES
     "math/tanh.zig"
     "math/trunc.zig"
     "mem.zig"
-    "meta/index.zig"
+    "meta.zig"
     "meta/trait.zig"
     "mutex.zig"
     "net.zig"
+    "os.zig"
     "os/child_process.zig"
     "os/darwin.zig"
     "os/darwin/errno.zig"
     "os/epoch.zig"
     "os/file.zig"
+    "os/freebsd.zig"
     "os/freebsd/errno.zig"
-    "os/freebsd/index.zig"
     "os/get_app_data_dir.zig"
     "os/get_user_id.zig"
-    "os/index.zig"
+    "os/linux.zig"
     "os/linux/arm64.zig"
     "os/linux/errno.zig"
-    "os/linux/index.zig"
     "os/linux/vdso.zig"
     "os/linux/x86_64.zig"
+    "os/netbsd.zig"
     "os/netbsd/errno.zig"
-    "os/netbsd/index.zig"
     "os/path.zig"
     "os/time.zig"
     "os/uefi.zig"
+    "os/windows.zig"
     "os/windows/advapi32.zig"
     "os/windows/error.zig"
-    "os/windows/index.zig"
     "os/windows/kernel32.zig"
     "os/windows/ntdll.zig"
     "os/windows/ole32.zig"
@@ -610,7 +609,7 @@ set(ZIG_STD_FILES
     "os/zen.zig"
     "pdb.zig"
     "priority_queue.zig"
-    "rand/index.zig"
+    "rand.zig"
     "rand/ziggurat.zig"
     "segmented_list.zig"
     "sort.zig"
@@ -619,6 +618,7 @@ set(ZIG_STD_FILES
     "special/bootstrap_windows_tls.zig"
     "special/build_runner.zig"
     "special/builtin.zig"
+    "special/compiler_rt.zig"
     "special/compiler_rt/addXf3.zig"
     "special/compiler_rt/aulldiv.zig"
     "special/compiler_rt/aullrem.zig"
@@ -653,7 +653,6 @@ set(ZIG_STD_FILES
     "special/compiler_rt/floatuntidf.zig"
     "special/compiler_rt/floatuntisf.zig"
     "special/compiler_rt/floatuntitf.zig"
-    "special/compiler_rt/index.zig"
     "special/compiler_rt/muloti4.zig"
     "special/compiler_rt/multi3.zig"
     "special/compiler_rt/truncXfYf2.zig"
@@ -671,10 +670,11 @@ set(ZIG_STD_FILES
     "special/test_runner.zig"
     "spinlock.zig"
     "statically_initialized_mutex.zig"
+    "std.zig"
     "testing.zig"
     "unicode.zig"
+    "zig.zig"
     "zig/ast.zig"
-    "zig/index.zig"
     "zig/parse.zig"
     "zig/parse_string_literal.zig"
     "zig/render.zig"

build.zig

@@ -115,9 +115,9 @@ pub fn build(b: *Builder) !void {
 
     test_step.dependOn(tests.addPkgTests(b, test_filter, "test/stage1/behavior.zig", "behavior", "Run the behavior tests", modes));
 
-    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/index.zig", "std", "Run the standard library tests", modes));
+    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/std.zig", "std", "Run the standard library tests", modes));
 
-    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/special/compiler_rt/index.zig", "compiler-rt", "Run the compiler_rt tests", modes));
+    test_step.dependOn(tests.addPkgTests(b, test_filter, "std/special/compiler_rt.zig", "compiler-rt", "Run the compiler_rt tests", modes));
 
     test_step.dependOn(tests.addCompareOutputTests(b, test_filter, modes));
     test_step.dependOn(tests.addBuildExampleTests(b, test_filter, modes));

src-self-hosted/compilation.zig

@@ -533,7 +533,7 @@ pub const Compilation = struct {
             const basename = std.os.path.basename(root_src);
 
             comp.root_package = try Package.create(comp.arena(), dirname, basename);
-            comp.std_package = try Package.create(comp.arena(), comp.zig_std_dir, "index.zig");
+            comp.std_package = try Package.create(comp.arena(), comp.zig_std_dir, "std.zig");
             try comp.root_package.add("std", comp.std_package);
         } else {
             comp.root_package = try Package.create(comp.arena(), ".", "");

src-self-hosted/introspect.zig

@@ -11,7 +11,7 @@ pub fn testZigInstallPrefix(allocator: *mem.Allocator, test_path: []const u8) ![
     const test_zig_dir = try os.path.join(allocator, [][]const u8{ test_path, "lib", "zig" });
     errdefer allocator.free(test_zig_dir);
 
-    const test_index_file = try os.path.join(allocator, [][]const u8{ test_zig_dir, "std", "index.zig" });
+    const test_index_file = try os.path.join(allocator, [][]const u8{ test_zig_dir, "std", "std.zig" });
     defer allocator.free(test_index_file);
 
     var file = try os.File.openRead(test_index_file);

src/codegen.cpp

@@ -162,7 +162,7 @@ CodeGen *codegen_create(Buf *main_pkg_path, Buf *root_src_path, const ZigTarget
         }
 
         g->root_package = new_package(buf_ptr(root_pkg_path), buf_ptr(rel_root_src_path), "");
-        g->std_package = new_package(buf_ptr(g->zig_std_dir), "index.zig", "std");
+        g->std_package = new_package(buf_ptr(g->zig_std_dir), "std.zig", "std");
         g->root_package->package_table.put(buf_create_from_str("std"), g->std_package);
     } else {
         g->root_package = new_package(".", "", "");

src/compiler.cpp

@@ -78,8 +78,8 @@ static bool test_zig_install_prefix(Buf *test_path, Buf *out_zig_lib_dir) {
     Buf std_buf = BUF_INIT;
     buf_init_from_str(&std_buf, "std");
 
-    Buf index_zig_buf = BUF_INIT;
-    buf_init_from_str(&index_zig_buf, "index.zig");
+    Buf std_zig_buf = BUF_INIT;
+    buf_init_from_str(&std_zig_buf, "std.zig");
 
     Buf test_lib_dir = BUF_INIT;
     Buf test_zig_dir = BUF_INIT;
@@ -89,7 +89,7 @@ static bool test_zig_install_prefix(Buf *test_path, Buf *out_zig_lib_dir) {
     os_path_join(test_path, &lib_buf, &test_lib_dir);
     os_path_join(&test_lib_dir, &zig_buf, &test_zig_dir);
     os_path_join(&test_zig_dir, &std_buf, &test_std_dir);
-    os_path_join(&test_std_dir, &index_zig_buf, &test_index_file);
+    os_path_join(&test_std_dir, &std_zig_buf, &test_index_file);
 
     int err;
     bool exists;

src/link.cpp

@@ -87,10 +87,8 @@ static Buf *build_a(CodeGen *parent_gen, const char *aname) {
 }
 
 static Buf *build_compiler_rt(CodeGen *parent_gen) {
-    Buf *dir_path = buf_alloc();
-    os_path_join(parent_gen->zig_std_special_dir, buf_create_from_str("compiler_rt"), dir_path);
     Buf *full_path = buf_alloc();
-    os_path_join(dir_path, buf_create_from_str("index.zig"), full_path);
+    os_path_join(parent_gen->zig_std_special_dir, buf_create_from_str("compiler_rt.zig"), full_path);
 
     return build_a_raw(parent_gen, "compiler_rt", full_path);
 }

std/array_list.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;
@@ -406,6 +406,6 @@ const Item = struct {
 
 test "std.ArrayList: ArrayList(T) of struct T" {
     var root = Item{ .integer = 1, .sub_items = ArrayList(Item).init(debug.global_allocator) };
-    try root.sub_items.append( Item{ .integer = 42, .sub_items = ArrayList(Item).init(debug.global_allocator) } );
+    try root.sub_items.append(Item{ .integer = 42, .sub_items = ArrayList(Item).init(debug.global_allocator) });
     testing.expect(root.sub_items.items[0].integer == 42);
 }

std/atomic.zig

@@ -0,0 +1,9 @@
+pub const Stack = @import("atomic/stack.zig").Stack;
+pub const Queue = @import("atomic/queue.zig").Queue;
+pub const Int = @import("atomic/int.zig").Int;
+
+test "std.atomic" {
+    _ = @import("atomic/stack.zig");
+    _ = @import("atomic/queue.zig");
+    _ = @import("atomic/int.zig");
+}

std/atomic/index.zig

@@ -1,9 +0,0 @@
-pub const Stack = @import("stack.zig").Stack;
-pub const Queue = @import("queue.zig").Queue;
-pub const Int = @import("int.zig").Int;
-
-test "std.atomic" {
-    _ = @import("stack.zig");
-    _ = @import("queue.zig");
-    _ = @import("int.zig");
-}

std/atomic/queue.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const AtomicOrder = builtin.AtomicOrder;
 const AtomicRmwOp = builtin.AtomicRmwOp;

std/atomic/stack.zig

@@ -68,7 +68,7 @@ pub fn Stack(comptime T: type) type {
     };
 }
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const Context = struct {
     allocator: *std.mem.Allocator,
     stack: *Stack(i32),

std/base64.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const mem = std.mem;

std/buf_map.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const HashMap = std.HashMap;
 const mem = std.mem;
 const Allocator = mem.Allocator;

std/buf_set.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const HashMap = @import("hash_map.zig").HashMap;
 const mem = @import("mem.zig");
 const Allocator = mem.Allocator;

std/buffer.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const mem = std.mem;
 const Allocator = mem.Allocator;

std/build.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const io = std.io;
 const mem = std.mem;

std/build/fmt.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const build = @import("../build.zig");
 const Step = build.Step;
 const Builder = build.Builder;

std/c.zig

@@ -2,14 +2,14 @@ const builtin = @import("builtin");
 const Os = builtin.Os;
 
 pub use switch (builtin.os) {
-    Os.linux => @import("linux.zig"),
-    Os.windows => @import("windows.zig"),
-    Os.macosx, Os.ios => @import("darwin.zig"),
-    Os.freebsd => @import("freebsd.zig"),
-    Os.netbsd => @import("netbsd.zig"),
+    Os.linux => @import("c/linux.zig"),
+    Os.windows => @import("c/windows.zig"),
+    Os.macosx, Os.ios => @import("c/darwin.zig"),
+    Os.freebsd => @import("c/freebsd.zig"),
+    Os.netbsd => @import("c/netbsd.zig"),
     else => empty_import,
 };
-const empty_import = @import("../empty.zig");
+const empty_import = @import("empty.zig");
 
 // TODO https://github.com/ziglang/zig/issues/265 on this whole file
 

std/c/darwin.zig

@@ -163,7 +163,7 @@ pub const Kevent = extern struct {
 // sys/types.h on macos uses #pragma pack(4) so these checks are
 // to make sure the struct is laid out the same. These values were
 // produced from C code using the offsetof macro.
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 
 comptime {

std/coff.zig

@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("index.zig");
+const std = @import("std.zig");
 const io = std.io;
 const mem = std.mem;
 const os = std.os;

std/crypto.zig

@@ -0,0 +1,45 @@
+pub const Md5 = @import("crypto/md5.zig").Md5;
+pub const Sha1 = @import("crypto/sha1.zig").Sha1;
+
+const sha2 = @import("crypto/sha2.zig");
+pub const Sha224 = sha2.Sha224;
+pub const Sha256 = sha2.Sha256;
+pub const Sha384 = sha2.Sha384;
+pub const Sha512 = sha2.Sha512;
+
+const sha3 = @import("crypto/sha3.zig");
+pub const Sha3_224 = sha3.Sha3_224;
+pub const Sha3_256 = sha3.Sha3_256;
+pub const Sha3_384 = sha3.Sha3_384;
+pub const Sha3_512 = sha3.Sha3_512;
+
+const blake2 = @import("crypto/blake2.zig");
+pub const Blake2s224 = blake2.Blake2s224;
+pub const Blake2s256 = blake2.Blake2s256;
+pub const Blake2b384 = blake2.Blake2b384;
+pub const Blake2b512 = blake2.Blake2b512;
+
+const hmac = @import("crypto/hmac.zig");
+pub const HmacMd5 = hmac.HmacMd5;
+pub const HmacSha1 = hmac.HmacSha1;
+pub const HmacSha256 = hmac.HmacSha256;
+pub const HmacBlake2s256 = hmac.HmacBlake2s256;
+
+const import_chaCha20 = @import("crypto/chacha20.zig");
+pub const chaCha20IETF = import_chaCha20.chaCha20IETF;
+pub const chaCha20With64BitNonce = import_chaCha20.chaCha20With64BitNonce;
+
+pub const Poly1305 = @import("crypto/poly1305.zig").Poly1305;
+pub const X25519 = @import("crypto/x25519.zig").X25519;
+
+test "crypto" {
+    _ = @import("crypto/blake2.zig");
+    _ = @import("crypto/chacha20.zig");
+    _ = @import("crypto/hmac.zig");
+    _ = @import("crypto/md5.zig");
+    _ = @import("crypto/poly1305.zig");
+    _ = @import("crypto/sha1.zig");
+    _ = @import("crypto/sha2.zig");
+    _ = @import("crypto/sha3.zig");
+    _ = @import("crypto/x25519.zig");
+}

std/crypto/blake2.zig

@@ -1,7 +1,7 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
 const builtin = @import("builtin");
 const htest = @import("test.zig");
 

std/crypto/chacha20.zig

@@ -1,6 +1,6 @@
 // Based on public domain Supercop by Daniel J. Bernstein
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const mem = std.mem;
 const endian = std.endian;
 const assert = std.debug.assert;

std/crypto/hmac.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const crypto = std.crypto;
 const debug = std.debug;
 const mem = std.mem;

std/crypto/index.zig

@@ -1,45 +0,0 @@
-pub const Md5 = @import("md5.zig").Md5;
-pub const Sha1 = @import("sha1.zig").Sha1;
-
-const sha2 = @import("sha2.zig");
-pub const Sha224 = sha2.Sha224;
-pub const Sha256 = sha2.Sha256;
-pub const Sha384 = sha2.Sha384;
-pub const Sha512 = sha2.Sha512;
-
-const sha3 = @import("sha3.zig");
-pub const Sha3_224 = sha3.Sha3_224;
-pub const Sha3_256 = sha3.Sha3_256;
-pub const Sha3_384 = sha3.Sha3_384;
-pub const Sha3_512 = sha3.Sha3_512;
-
-const blake2 = @import("blake2.zig");
-pub const Blake2s224 = blake2.Blake2s224;
-pub const Blake2s256 = blake2.Blake2s256;
-pub const Blake2b384 = blake2.Blake2b384;
-pub const Blake2b512 = blake2.Blake2b512;
-
-const hmac = @import("hmac.zig");
-pub const HmacMd5 = hmac.HmacMd5;
-pub const HmacSha1 = hmac.HmacSha1;
-pub const HmacSha256 = hmac.HmacSha256;
-pub const HmacBlake2s256 = hmac.HmacBlake2s256;
-
-const import_chaCha20 = @import("chacha20.zig");
-pub const chaCha20IETF = import_chaCha20.chaCha20IETF;
-pub const chaCha20With64BitNonce = import_chaCha20.chaCha20With64BitNonce;
-
-pub const Poly1305 = @import("poly1305.zig").Poly1305;
-pub const X25519 = @import("x25519.zig").X25519;
-
-test "crypto" {
-    _ = @import("blake2.zig");
-    _ = @import("chacha20.zig");
-    _ = @import("hmac.zig");
-    _ = @import("md5.zig");
-    _ = @import("poly1305.zig");
-    _ = @import("sha1.zig");
-    _ = @import("sha2.zig");
-    _ = @import("sha3.zig");
-    _ = @import("x25519.zig");
-}

std/crypto/md5.zig

@@ -1,9 +1,9 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
 const builtin = @import("builtin");
-const debug = @import("../debug/index.zig");
-const fmt = @import("../fmt/index.zig");
+const debug = @import("../debug.zig");
+const fmt = @import("../fmt.zig");
 
 const RoundParam = struct {
     a: usize,

std/crypto/poly1305.zig

@@ -2,7 +2,7 @@
 //
 // https://monocypher.org/
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 
 const Endian = builtin.Endian;

std/crypto/sha1.zig

@@ -1,7 +1,7 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
 const builtin = @import("builtin");
 
 const RoundParam = struct {

std/crypto/sha2.zig

@@ -1,7 +1,7 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
 const builtin = @import("builtin");
 const htest = @import("test.zig");
 

std/crypto/sha3.zig

@@ -1,7 +1,7 @@
 const mem = @import("../mem.zig");
-const math = @import("../math/index.zig");
+const math = @import("../math.zig");
 const endian = @import("../endian.zig");
-const debug = @import("../debug/index.zig");
+const debug = @import("../debug.zig");
 const builtin = @import("builtin");
 const htest = @import("test.zig");
 

std/crypto/test.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const testing = std.testing;
 const mem = std.mem;
 const fmt = std.fmt;

std/crypto/throughput_test.zig

@@ -2,7 +2,7 @@ const builtin = @import("builtin");
 const std = @import("std");
 const time = std.os.time;
 const Timer = time.Timer;
-const crypto = @import("index.zig");
+const crypto = @import("../crypto.zig");
 
 const KiB = 1024;
 const MiB = 1024 * KiB;

std/crypto/x25519.zig

@@ -2,7 +2,7 @@
 //
 // https://monocypher.org/
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const fmt = std.fmt;
 

std/cstr.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const debug = std.debug;
 const mem = std.mem;

std/debug.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const math = std.math;
 const mem = std.mem;
 const io = std.io;
@@ -13,7 +13,7 @@ const ArrayList = std.ArrayList;
 const builtin = @import("builtin");
 const maxInt = std.math.maxInt;
 
-pub const FailingAllocator = @import("failing_allocator.zig").FailingAllocator;
+pub const FailingAllocator = @import("debug/failing_allocator.zig").FailingAllocator;
 pub const failing_allocator = &FailingAllocator.init(global_allocator, 0).allocator;
 
 pub const runtime_safety = switch (builtin.mode) {

std/debug/failing_allocator.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const mem = std.mem;
 
 /// Allocator that fails after N allocations, useful for making sure out of

std/dynamic_library.zig

@@ -1,7 +1,7 @@
 const builtin = @import("builtin");
 const Os = builtin.Os;
 
-const std = @import("index.zig");
+const std = @import("std.zig");
 const mem = std.mem;
 const cstr = std.cstr;
 const os = std.os;

std/elf.zig

@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("index.zig");
+const std = @import("std.zig");
 const io = std.io;
 const os = std.os;
 const math = std.math;

std/event/channel.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;

std/event/fs.zig

@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const event = std.event;
 const assert = std.debug.assert;
 const testing = std.testing;
@@ -404,11 +404,7 @@ pub async fn openPosix(
 
 pub async fn openRead(loop: *Loop, path: []const u8) os.File.OpenError!os.FileHandle {
     switch (builtin.os) {
-        builtin.Os.macosx,
-        builtin.Os.linux,
-        builtin.Os.freebsd,
-        builtin.Os.netbsd
-        => {
+        builtin.Os.macosx, builtin.Os.linux, builtin.Os.freebsd, builtin.Os.netbsd => {
             const flags = posix.O_LARGEFILE | posix.O_RDONLY | posix.O_CLOEXEC;
             return await (async openPosix(loop, path, flags, os.File.default_mode) catch unreachable);
         },
@@ -876,10 +872,7 @@ pub fn Watch(comptime V: type) type {
 
         pub async fn addFile(self: *Self, file_path: []const u8, value: V) !?V {
             switch (builtin.os) {
-                builtin.Os.macosx,
-                builtin.Os.freebsd,
-                builtin.Os.netbsd
-                => return await (async addFileKEvent(self, file_path, value) catch unreachable),
+                builtin.Os.macosx, builtin.Os.freebsd, builtin.Os.netbsd => return await (async addFileKEvent(self, file_path, value) catch unreachable),
                 builtin.Os.linux => return await (async addFileLinux(self, file_path, value) catch unreachable),
                 builtin.Os.windows => return await (async addFileWindows(self, file_path, value) catch unreachable),
                 else => @compileError("Unsupported OS"),

std/event/future.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const builtin = @import("builtin");

std/event/group.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const Lock = std.event.Lock;
 const Loop = std.event.Loop;

std/event/io.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const Allocator = std.mem.Allocator;
 const assert = std.debug.assert;

std/event/lock.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;

std/event/locked.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const Lock = std.event.Lock;
 const Loop = std.event.Loop;
 

std/event/loop.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;

std/event/net.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const testing = std.testing;
 const event = std.event;

std/event/rwlock.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;

std/event/rwlocked.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const RwLock = std.event.RwLock;
 const Loop = std.event.Loop;
 

std/fmt.zig

@@ -1,11 +1,11 @@
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const math = std.math;
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;
 const mem = std.mem;
 const builtin = @import("builtin");
-const errol = @import("errol/index.zig");
+const errol = @import("fmt/errol.zig");
 const lossyCast = std.math.lossyCast;
 
 const max_int_digits = 65;
@@ -858,10 +858,10 @@ test "fmt.parseUnsigned" {
     testing.expectError(error.Overflow, parseUnsigned(u2, "4", 16));
 }
 
-pub const parseFloat = @import("parse_float.zig").parseFloat;
+pub const parseFloat = @import("fmt/parse_float.zig").parseFloat;
 
 test "fmt.parseFloat" {
-    _ = @import("parse_float.zig");
+    _ = @import("fmt/parse_float.zig");
 }
 
 pub fn charToDigit(c: u8, radix: u8) (error{InvalidCharacter}!u8) {

std/fmt/errol.zig

@@ -1,8 +1,8 @@
-const std = @import("../../index.zig");
-const enum3 = @import("enum3.zig").enum3;
-const enum3_data = @import("enum3.zig").enum3_data;
-const lookup_table = @import("lookup.zig").lookup_table;
-const HP = @import("lookup.zig").HP;
+const std = @import("../std.zig");
+const enum3 = @import("errol/enum3.zig").enum3;
+const enum3_data = @import("errol/enum3.zig").enum3_data;
+const lookup_table = @import("errol/lookup.zig").lookup_table;
+const HP = @import("errol/lookup.zig").HP;
 const math = std.math;
 const mem = std.mem;
 const assert = std.debug.assert;

std/fmt/parse_float.zig

@@ -29,7 +29,7 @@
 // - Only supports round-to-zero
 // - Does not handle denormals
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 
 const max_digits = 25;
 

std/hash.zig

@@ -1,22 +1,22 @@
-const adler = @import("adler.zig");
+const adler = @import("hash/adler.zig");
 pub const Adler32 = adler.Adler32;
 
 // pub for polynomials + generic crc32 construction
-pub const crc = @import("crc.zig");
+pub const crc = @import("hash/crc.zig");
 pub const Crc32 = crc.Crc32;
 
-const fnv = @import("fnv.zig");
+const fnv = @import("hash/fnv.zig");
 pub const Fnv1a_32 = fnv.Fnv1a_32;
 pub const Fnv1a_64 = fnv.Fnv1a_64;
 pub const Fnv1a_128 = fnv.Fnv1a_128;
 
-const siphash = @import("siphash.zig");
+const siphash = @import("hash/siphash.zig");
 pub const SipHash64 = siphash.SipHash64;
 pub const SipHash128 = siphash.SipHash128;
 
 test "hash" {
-    _ = @import("adler.zig");
-    _ = @import("crc.zig");
-    _ = @import("fnv.zig");
-    _ = @import("siphash.zig");
+    _ = @import("hash/adler.zig");
+    _ = @import("hash/crc.zig");
+    _ = @import("hash/fnv.zig");
+    _ = @import("hash/siphash.zig");
 }

std/hash/adler.zig

@@ -3,7 +3,7 @@
 // https://tools.ietf.org/html/rfc1950#section-9
 // https://github.com/madler/zlib/blob/master/adler32.c
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const testing = std.testing;
 
 pub const Adler32 = struct {

std/hash/crc.zig

@@ -5,7 +5,7 @@
 // - Crc32SmallWithPoly uses only 64 bytes of memory but is slower. Be aware that this is
 //   still moderately fast just slow relative to the slicing approach.
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const debug = std.debug;
 const testing = std.testing;
 

std/hash/fnv.zig

@@ -4,7 +4,7 @@
 //
 // https://tools.ietf.org/html/draft-eastlake-fnv-14
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const testing = std.testing;
 
 pub const Fnv1a_32 = Fnv1a(u32, 0x01000193, 0x811c9dc5);

std/hash/siphash.zig

@@ -5,7 +5,7 @@
 //
 // https://131002.net/siphash/
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const assert = std.debug.assert;
 const testing = std.testing;
 const math = std.math;

std/hash_map.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;

std/heap.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;

std/io.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const Os = builtin.Os;
 const c = std.c;

std/io/seekable_stream.zig

@@ -1,4 +1,4 @@
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const InStream = std.io.InStream;
 
 pub fn SeekableStream(comptime SeekErrorType: type, comptime GetSeekPosErrorType: type) type {

std/io_test.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const io = std.io;
 const meta = std.meta;
 const trait = std.trait;
@@ -34,8 +34,7 @@ test "write a file, read it, then delete it" {
         // make sure openWriteNoClobber doesn't harm the file
         if (os.File.openWriteNoClobber(tmp_file_name, os.File.default_mode)) |file| {
             unreachable;
-        }
-        else |err| {
+        } else |err| {
             std.debug.assert(err == os.File.OpenError.PathAlreadyExists);
         }
     }
@@ -180,7 +179,7 @@ test "BitInStream" {
     expect(out_bits == 16);
 
     _ = try bit_stream_be.readBits(u0, 0, &out_bits);
-    
+
     expect(0 == try bit_stream_be.readBits(u1, 1, &out_bits));
     expect(out_bits == 0);
     expectError(error.EndOfStream, bit_stream_be.readBitsNoEof(u1, 1));
@@ -212,7 +211,7 @@ test "BitInStream" {
     expect(out_bits == 16);
 
     _ = try bit_stream_le.readBits(u0, 0, &out_bits);
-    
+
     expect(0 == try bit_stream_le.readBits(u1, 1, &out_bits));
     expect(out_bits == 0);
     expectError(error.EndOfStream, bit_stream_le.readBitsNoEof(u1, 1));
@@ -281,7 +280,7 @@ test "BitStreams with File Stream" {
         var file_out_stream = &file_out.stream;
         const OutError = os.File.WriteError;
         var bit_stream = io.BitOutStream(builtin.endian, OutError).init(file_out_stream);
-        
+
         try bit_stream.writeBits(u2(1), 1);
         try bit_stream.writeBits(u5(2), 2);
         try bit_stream.writeBits(u128(3), 3);
@@ -298,7 +297,7 @@ test "BitStreams with File Stream" {
         var file_in_stream = &file_in.stream;
         const InError = os.File.ReadError;
         var bit_stream = io.BitInStream(builtin.endian, InError).init(file_in_stream);
-        
+
         var out_bits: usize = undefined;
 
         expect(1 == try bit_stream.readBits(u2, 1, &out_bits));
@@ -313,7 +312,7 @@ test "BitStreams with File Stream" {
         expect(out_bits == 5);
         expect(1 == try bit_stream.readBits(u1, 1, &out_bits));
         expect(out_bits == 1);
-        
+
         expectError(error.EndOfStream, bit_stream.readBitsNoEof(u1, 1));
     }
     try os.deleteFile(tmp_file_name);
@@ -322,14 +321,14 @@ test "BitStreams with File Stream" {
 fn testIntSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packed: bool) !void {
     //@NOTE: if this test is taking too long, reduce the maximum tested bitsize
     const max_test_bitsize = 128;
-    
+
     const total_bytes = comptime blk: {
         var bytes = 0;
         comptime var i = 0;
         while (i <= max_test_bitsize) : (i += 1) bytes += (i / 8) + @boolToInt(i % 8 > 0);
         break :blk bytes * 2;
     };
-    
+
     var data_mem: [total_bytes]u8 = undefined;
     var out = io.SliceOutStream.init(data_mem[0..]);
     const OutError = io.SliceOutStream.Error;
@@ -386,12 +385,13 @@ test "Serializer/Deserializer Int" {
     try testIntSerializerDeserializer(builtin.Endian.Little, true);
 }
 
-fn testIntSerializerDeserializerInfNaN(comptime endian: builtin.Endian, 
-    comptime is_packed: bool) !void
-{
-    const mem_size = (16*2 + 32*2 + 64*2 + 128*2) / comptime meta.bitCount(u8);
+fn testIntSerializerDeserializerInfNaN(
+    comptime endian: builtin.Endian,
+    comptime is_packed: bool,
+) !void {
+    const mem_size = (16 * 2 + 32 * 2 + 64 * 2 + 128 * 2) / comptime meta.bitCount(u8);
     var data_mem: [mem_size]u8 = undefined;
-    
+
     var out = io.SliceOutStream.init(data_mem[0..]);
     const OutError = io.SliceOutStream.Error;
     var out_stream = &out.stream;
@@ -472,8 +472,6 @@ fn testSerializerDeserializer(comptime endian: builtin.Endian, comptime is_packe
         f_u2: u2,
     };
 
-    
-    
     //to test custom serialization
     const Custom = struct {
         f_f16: f16,

std/json.zig

@@ -2,7 +2,7 @@
 //
 // https://tools.ietf.org/html/rfc8259
 
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const testing = std.testing;
 const mem = std.mem;

std/json_test.zig

@@ -3,7 +3,7 @@
 // Tests are taken from https://github.com/nst/JSONTestSuite
 // Read also http://seriot.ch/parsing_json.php for a good overview.
 
-const std = @import("index.zig");
+const std = @import("std.zig");
 
 fn ok(comptime s: []const u8) void {
     std.testing.expect(std.json.validate(s));

std/lazy_init.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const builtin = @import("builtin");
 const assert = std.debug.assert;
 const testing = std.testing;

std/linked_list.zig

@@ -1,4 +1,4 @@
-const std = @import("index.zig");
+const std = @import("std.zig");
 const debug = std.debug;
 const assert = debug.assert;
 const testing = std.testing;

std/math.zig

@@ -1,5 +1,5 @@
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("std.zig");
 const TypeId = builtin.TypeId;
 const assert = std.debug.assert;
 const testing = std.testing;
@@ -57,9 +57,9 @@ pub const nan_f128 = @bitCast(f128, nan_u128);
 pub const inf_u128 = u128(0x7fff0000000000000000000000000000);
 pub const inf_f128 = @bitCast(f128, inf_u128);
 
-pub const nan = @import("nan.zig").nan;
-pub const snan = @import("nan.zig").snan;
-pub const inf = @import("inf.zig").inf;
+pub const nan = @import("math/nan.zig").nan;
+pub const snan = @import("math/nan.zig").snan;
+pub const inf = @import("math/inf.zig").inf;
 
 pub fn approxEq(comptime T: type, x: T, y: T, epsilon: T) bool {
     assert(@typeId(T) == TypeId.Float);
@@ -111,109 +111,109 @@ pub fn raiseDivByZero() void {
     // Raise INEXACT fpu exception
 }
 
-pub const isNan = @import("isnan.zig").isNan;
-pub const isSignalNan = @import("isnan.zig").isSignalNan;
-pub const fabs = @import("fabs.zig").fabs;
-pub const ceil = @import("ceil.zig").ceil;
-pub const floor = @import("floor.zig").floor;
-pub const trunc = @import("trunc.zig").trunc;
-pub const round = @import("round.zig").round;
-pub const frexp = @import("frexp.zig").frexp;
-pub const frexp32_result = @import("frexp.zig").frexp32_result;
-pub const frexp64_result = @import("frexp.zig").frexp64_result;
-pub const modf = @import("modf.zig").modf;
-pub const modf32_result = @import("modf.zig").modf32_result;
-pub const modf64_result = @import("modf.zig").modf64_result;
-pub const copysign = @import("copysign.zig").copysign;
-pub const isFinite = @import("isfinite.zig").isFinite;
-pub const isInf = @import("isinf.zig").isInf;
-pub const isPositiveInf = @import("isinf.zig").isPositiveInf;
-pub const isNegativeInf = @import("isinf.zig").isNegativeInf;
-pub const isNormal = @import("isnormal.zig").isNormal;
-pub const signbit = @import("signbit.zig").signbit;
-pub const scalbn = @import("scalbn.zig").scalbn;
-pub const pow = @import("pow.zig").pow;
-pub const powi = @import("powi.zig").powi;
-pub const sqrt = @import("sqrt.zig").sqrt;
-pub const cbrt = @import("cbrt.zig").cbrt;
-pub const acos = @import("acos.zig").acos;
-pub const asin = @import("asin.zig").asin;
-pub const atan = @import("atan.zig").atan;
-pub const atan2 = @import("atan2.zig").atan2;
-pub const hypot = @import("hypot.zig").hypot;
-pub const exp = @import("exp.zig").exp;
-pub const exp2 = @import("exp2.zig").exp2;
-pub const expm1 = @import("expm1.zig").expm1;
-pub const ilogb = @import("ilogb.zig").ilogb;
-pub const ln = @import("ln.zig").ln;
-pub const log = @import("log.zig").log;
-pub const log2 = @import("log2.zig").log2;
-pub const log10 = @import("log10.zig").log10;
-pub const log1p = @import("log1p.zig").log1p;
-pub const fma = @import("fma.zig").fma;
-pub const asinh = @import("asinh.zig").asinh;
-pub const acosh = @import("acosh.zig").acosh;
-pub const atanh = @import("atanh.zig").atanh;
-pub const sinh = @import("sinh.zig").sinh;
-pub const cosh = @import("cosh.zig").cosh;
-pub const tanh = @import("tanh.zig").tanh;
-pub const cos = @import("cos.zig").cos;
-pub const sin = @import("sin.zig").sin;
-pub const tan = @import("tan.zig").tan;
+pub const isNan = @import("math/isnan.zig").isNan;
+pub const isSignalNan = @import("math/isnan.zig").isSignalNan;
+pub const fabs = @import("math/fabs.zig").fabs;
+pub const ceil = @import("math/ceil.zig").ceil;
+pub const floor = @import("math/floor.zig").floor;
+pub const trunc = @import("math/trunc.zig").trunc;
+pub const round = @import("math/round.zig").round;
+pub const frexp = @import("math/frexp.zig").frexp;
+pub const frexp32_result = @import("math/frexp.zig").frexp32_result;
+pub const frexp64_result = @import("math/frexp.zig").frexp64_result;
+pub const modf = @import("math/modf.zig").modf;
+pub const modf32_result = @import("math/modf.zig").modf32_result;
+pub const modf64_result = @import("math/modf.zig").modf64_result;
+pub const copysign = @import("math/copysign.zig").copysign;
+pub const isFinite = @import("math/isfinite.zig").isFinite;
+pub const isInf = @import("math/isinf.zig").isInf;
+pub const isPositiveInf = @import("math/isinf.zig").isPositiveInf;
+pub const isNegativeInf = @import("math/isinf.zig").isNegativeInf;
+pub const isNormal = @import("math/isnormal.zig").isNormal;
+pub const signbit = @import("math/signbit.zig").signbit;
+pub const scalbn = @import("math/scalbn.zig").scalbn;
+pub const pow = @import("math/pow.zig").pow;
+pub const powi = @import("math/powi.zig").powi;
+pub const sqrt = @import("math/sqrt.zig").sqrt;
+pub const cbrt = @import("math/cbrt.zig").cbrt;
+pub const acos = @import("math/acos.zig").acos;
+pub const asin = @import("math/asin.zig").asin;
+pub const atan = @import("math/atan.zig").atan;
+pub const atan2 = @import("math/atan2.zig").atan2;
+pub const hypot = @import("math/hypot.zig").hypot;
+pub const exp = @import("math/exp.zig").exp;
+pub const exp2 = @import("math/exp2.zig").exp2;
+pub const expm1 = @import("math/expm1.zig").expm1;
+pub const ilogb = @import("math/ilogb.zig").ilogb;
+pub const ln = @import("math/ln.zig").ln;
+pub const log = @import("math/log.zig").log;
+pub const log2 = @import("math/log2.zig").log2;
+pub const log10 = @import("math/log10.zig").log10;
+pub const log1p = @import("math/log1p.zig").log1p;
+pub const fma = @import("math/fma.zig").fma;
+pub const asinh = @import("math/asinh.zig").asinh;
+pub const acosh = @import("math/acosh.zig").acosh;
+pub const atanh = @import("math/atanh.zig").atanh;
+pub const sinh = @import("math/sinh.zig").sinh;
+pub const cosh = @import("math/cosh.zig").cosh;
+pub const tanh = @import("math/tanh.zig").tanh;
+pub const cos = @import("math/cos.zig").cos;
+pub const sin = @import("math/sin.zig").sin;
+pub const tan = @import("math/tan.zig").tan;
 
-pub const complex = @import("complex/index.zig");
+pub const complex = @import("math/complex.zig");
 pub const Complex = complex.Complex;
 
-pub const big = @import("big/index.zig");
+pub const big = @import("math/big.zig");
 
 test "math" {
-    _ = @import("nan.zig");
-    _ = @import("isnan.zig");
-    _ = @import("fabs.zig");
-    _ = @import("ceil.zig");
-    _ = @import("floor.zig");
-    _ = @import("trunc.zig");
-    _ = @import("round.zig");
-    _ = @import("frexp.zig");
-    _ = @import("modf.zig");
-    _ = @import("copysign.zig");
-    _ = @import("isfinite.zig");
-    _ = @import("isinf.zig");
-    _ = @import("isnormal.zig");
-    _ = @import("signbit.zig");
-    _ = @import("scalbn.zig");
-    _ = @import("pow.zig");
-    _ = @import("powi.zig");
-    _ = @import("sqrt.zig");
-    _ = @import("cbrt.zig");
-    _ = @import("acos.zig");
-    _ = @import("asin.zig");
-    _ = @import("atan.zig");
-    _ = @import("atan2.zig");
-    _ = @import("hypot.zig");
-    _ = @import("exp.zig");
-    _ = @import("exp2.zig");
-    _ = @import("expm1.zig");
-    _ = @import("ilogb.zig");
-    _ = @import("ln.zig");
-    _ = @import("log.zig");
-    _ = @import("log2.zig");
-    _ = @import("log10.zig");
-    _ = @import("log1p.zig");
-    _ = @import("fma.zig");
-    _ = @import("asinh.zig");
-    _ = @import("acosh.zig");
-    _ = @import("atanh.zig");
-    _ = @import("sinh.zig");
-    _ = @import("cosh.zig");
-    _ = @import("tanh.zig");
-    _ = @import("sin.zig");
-    _ = @import("cos.zig");
-    _ = @import("tan.zig");
+    _ = @import("math/nan.zig");
+    _ = @import("math/isnan.zig");
+    _ = @import("math/fabs.zig");
+    _ = @import("math/ceil.zig");
+    _ = @import("math/floor.zig");
+    _ = @import("math/trunc.zig");
+    _ = @import("math/round.zig");
+    _ = @import("math/frexp.zig");
+    _ = @import("math/modf.zig");
+    _ = @import("math/copysign.zig");
+    _ = @import("math/isfinite.zig");
+    _ = @import("math/isinf.zig");
+    _ = @import("math/isnormal.zig");
+    _ = @import("math/signbit.zig");
+    _ = @import("math/scalbn.zig");
+    _ = @import("math/pow.zig");
+    _ = @import("math/powi.zig");
+    _ = @import("math/sqrt.zig");
+    _ = @import("math/cbrt.zig");
+    _ = @import("math/acos.zig");
+    _ = @import("math/asin.zig");
+    _ = @import("math/atan.zig");
+    _ = @import("math/atan2.zig");
+    _ = @import("math/hypot.zig");
+    _ = @import("math/exp.zig");
+    _ = @import("math/exp2.zig");
+    _ = @import("math/expm1.zig");
+    _ = @import("math/ilogb.zig");
+    _ = @import("math/ln.zig");
+    _ = @import("math/log.zig");
+    _ = @import("math/log2.zig");
+    _ = @import("math/log10.zig");
+    _ = @import("math/log1p.zig");
+    _ = @import("math/fma.zig");
+    _ = @import("math/asinh.zig");
+    _ = @import("math/acosh.zig");
+    _ = @import("math/atanh.zig");
+    _ = @import("math/sinh.zig");
+    _ = @import("math/cosh.zig");
+    _ = @import("math/tanh.zig");
+    _ = @import("math/sin.zig");
+    _ = @import("math/cos.zig");
+    _ = @import("math/tan.zig");
 
-    _ = @import("complex/index.zig");
+    _ = @import("math/complex.zig");
 
-    _ = @import("big/index.zig");
+    _ = @import("math/big.zig");
 }
 
 pub fn floatMantissaBits(comptime T: type) comptime_int {

std/math/acos.zig

@@ -2,7 +2,7 @@
 //
 // - acos(x)   = nan if x < -1 or x > 1
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

std/math/acosh.zig

@@ -4,7 +4,7 @@
 // - acosh(nan) = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

std/math/asin.zig

@@ -3,7 +3,7 @@
 // - asin(+-0) = +-0
 // - asin(x)   = nan if x < -1 or x > 1
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

std/math/asinh.zig

@@ -4,7 +4,7 @@
 // - asinh(+-inf) = +-inf
 // - asinh(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;

std/math/atan.zig

@@ -3,7 +3,7 @@
 // - atan(+-0)   = +-0
 // - atan(+-inf) = +-pi/2
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

std/math/atan2.zig

@@ -18,7 +18,7 @@
 //  atan2(+inf, x)    = +pi/2
 //  atan2(-inf, x)    = -pi/2
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

std/math/atanh.zig

@@ -4,7 +4,7 @@
 // - atanh(x)   = nan if |x| > 1 with signal
 // - atanh(nan) = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 const maxInt = std.math.maxInt;

std/math/big.zig

@@ -0,0 +1,5 @@
+pub use @import("big/int.zig");
+
+test "math.big" {
+    _ = @import("big/int.zig");
+}

std/math/big/index.zig

@@ -1,5 +0,0 @@
-pub use @import("int.zig");
-
-test "math.big" {
-    _ = @import("int.zig");
-}

std/math/big/int.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const builtin = @import("builtin");
 const debug = std.debug;
 const testing = std.testing;

std/math/cbrt.zig

@@ -4,7 +4,7 @@
 // - cbrt(+-inf) = +-inf
 // - cbrt(nan)   = nan
 
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

std/math/ceil.zig

@@ -5,7 +5,7 @@
 // - ceil(nan)   = nan
 
 const builtin = @import("builtin");
-const std = @import("../index.zig");
+const std = @import("../std.zig");
 const math = std.math;
 const expect = std.testing.expect;
 

std/math/complex.zig

@@ -1,27 +1,27 @@
-const std = @import("../../index.zig");
+const std = @import("../std.zig");
 const testing = std.testing;
 const math = std.math;
 
-pub const abs = @import("abs.zig").abs;
-pub const acosh = @import("acosh.zig").acosh;
-pub const acos = @import("acos.zig").acos;
-pub const arg = @import("arg.zig").arg;
-pub const asinh = @import("asinh.zig").asinh;
-pub const asin = @import("asin.zig").asin;
-pub const atanh = @import("atanh.zig").atanh;
-pub const atan = @import("atan.zig").atan;
-pub const conj = @import("conj.zig").conj;
-pub const cosh = @import("cosh.zig").cosh;
-pub const cos = @import("cos.zig").cos;
-pub const exp = @import("exp.zig").exp;
-pub const log = @import("log.zig").log;
-pub const pow = @import("pow.zig").pow;
-pub const proj = @import("proj.zig").proj;
-pub const sinh = @import("sinh.zig").sinh;
-pub const sin = @import("sin.zig").sin;
-pub const sqrt = @import("sqrt.zig").sqrt;
-pub const tanh = @import("tanh.zig").tanh;
-pub const tan = @import("tan.zig").tan;
+pub const abs = @import("complex/abs.zig").abs;
+pub const acosh = @import("complex/acosh.zig").acosh;
+pub const acos = @import("complex/acos.zig").acos;
+pub const arg = @import("complex/arg.zig").arg;
+pub const asinh = @import("complex/asinh.zig").asinh;
+pub const asin = @import("complex/asin.zig").asin;
+pub const atanh = @import("complex/atanh.zig").atanh;
+pub const atan = @import("complex/atan.zig").atan;
+pub const conj = @import("complex/conj.zig").conj;
+pub const cosh = @import("complex/cosh.zig").cosh;
+pub const cos = @import("complex/cos.zig").cos;
+pub const exp = @import("complex/exp.zig").exp;
+pub const log = @import("complex/log.zig").log;
+pub const pow = @import("complex/pow.zig").pow;
+pub const proj = @import("complex/proj.zig").proj;
+pub const sinh = @import("complex/sinh.zig").sinh;
+pub const sin = @import("complex/sin.zig").sin;
+pub const sqrt = @import("complex/sqrt.zig").sqrt;
+pub const tanh = @import("complex/tanh.zig").tanh;
+pub const tan = @import("complex/tan.zig").tan;
 
 pub fn Complex(comptime T: type) type {
     return struct {
@@ -148,24 +148,24 @@ test "complex.magnitude" {
 }
 
 test "complex.cmath" {
-    _ = @import("abs.zig");
-    _ = @import("acosh.zig");
-    _ = @import("acos.zig");
-    _ = @import("arg.zig");
-    _ = @import("asinh.zig");
-    _ = @import("asin.zig");
-    _ = @import("atanh.zig");
-    _ = @import("atan.zig");
-    _ = @import("conj.zig");
-    _ = @import("cosh.zig");
-    _ = @import("cos.zig");
-    _ = @import("exp.zig");
-    _ = @import("log.zig");
-    _ = @import("pow.zig");
-    _ = @import("proj.zig");
-    _ = @import("sinh.zig");
-    _ = @import("sin.zig");
-    _ = @import("sqrt.zig");
-    _ = @import("tanh.zig");
-    _ = @import("tan.zig");
+    _ = @import("complex/abs.zig");
+    _ = @import("complex/acosh.zig");
+    _ = @import("complex/acos.zig");
+    _ = @import("complex/arg.zig");
+    _ = @import("complex/asinh.zig");
+    _ = @import("complex/asin.zig");
+    _ = @import("complex/atanh.zig");
+    _ = @import("complex/atan.zig");
+    _ = @import("complex/conj.zig");
+    _ = @import("complex/cosh.zig");
+    _ = @import("complex/cos.zig");
+    _ = @import("complex/exp.zig");
+    _ = @import("complex/log.zig");
+    _ = @import("complex/pow.zig");
+    _ = @import("complex/proj.zig");
+    _ = @import("complex/sinh.zig");
+    _ = @import("complex/sin.zig");
+    _ = @import("complex/sqrt.zig");
+    _ = @import("complex/tanh.zig");
+    _ = @import("complex/tan.zig");
 }

std/math/complex/abs.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/acos.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/acosh.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/arg.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/asin.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/asinh.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/atan.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/atanh.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/conj.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/cos.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/cosh.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/exp.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/ldexp.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const debug = std.debug;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/log.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/pow.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/proj.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/sin.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;

std/math/complex/sinh.zig

@@ -1,4 +1,4 @@
-const std = @import("../../index.zig");
+const std = @import("../../std.zig");
 const testing = std.testing;
 const math = std.math;
 const cmath = math.complex;