From e40245570422c137f7239f411128973cc217389e Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Sat, 2 Mar 2019 16:46:04 -0500 Subject: [PATCH] rename std lib files to new convention --- .builds/freebsd.yml | 16 +- CMakeLists.txt | 40 ++-- build.zig | 4 +- src-self-hosted/compilation.zig | 2 +- src-self-hosted/introspect.zig | 2 +- src/codegen.cpp | 2 +- src/compiler.cpp | 6 +- src/link.cpp | 4 +- std/array_list.zig | 4 +- std/atomic.zig | 9 + std/atomic/index.zig | 9 - std/atomic/queue.zig | 2 +- std/atomic/stack.zig | 2 +- std/base64.zig | 2 +- std/buf_map.zig | 2 +- std/buf_set.zig | 2 +- std/buffer.zig | 2 +- std/build.zig | 2 +- std/build/fmt.zig | 2 +- std/{c/index.zig => c.zig} | 12 +- std/c/darwin.zig | 2 +- std/coff.zig | 2 +- std/crypto.zig | 45 ++++ std/crypto/blake2.zig | 4 +- std/crypto/chacha20.zig | 2 +- std/crypto/hmac.zig | 2 +- std/crypto/index.zig | 45 ---- std/crypto/md5.zig | 6 +- std/crypto/poly1305.zig | 2 +- std/crypto/sha1.zig | 4 +- std/crypto/sha2.zig | 4 +- std/crypto/sha3.zig | 4 +- std/crypto/test.zig | 2 +- std/crypto/throughput_test.zig | 2 +- std/crypto/x25519.zig | 2 +- std/cstr.zig | 2 +- std/{debug/index.zig => debug.zig} | 4 +- std/debug/failing_allocator.zig | 2 +- std/dynamic_library.zig | 2 +- std/elf.zig | 2 +- std/event/channel.zig | 2 +- std/event/fs.zig | 13 +- std/event/future.zig | 2 +- std/event/group.zig | 2 +- std/event/io.zig | 2 +- std/event/lock.zig | 2 +- std/event/locked.zig | 2 +- std/event/loop.zig | 2 +- std/event/net.zig | 2 +- std/event/rwlock.zig | 2 +- std/event/rwlocked.zig | 2 +- std/{fmt/index.zig => fmt.zig} | 8 +- std/fmt/{errol/index.zig => errol.zig} | 10 +- std/fmt/parse_float.zig | 2 +- std/{hash/index.zig => hash.zig} | 16 +- std/hash/adler.zig | 2 +- std/hash/crc.zig | 2 +- std/hash/fnv.zig | 2 +- std/hash/siphash.zig | 2 +- std/hash_map.zig | 2 +- std/heap.zig | 2 +- std/io.zig | 2 +- std/io/seekable_stream.zig | 2 +- std/io_test.zig | 32 ++- std/json.zig | 2 +- std/json_test.zig | 2 +- std/lazy_init.zig | 2 +- std/linked_list.zig | 2 +- std/{math/index.zig => math.zig} | 200 +++++++++--------- std/math/acos.zig | 2 +- std/math/acosh.zig | 2 +- std/math/asin.zig | 2 +- std/math/asinh.zig | 2 +- std/math/atan.zig | 2 +- std/math/atan2.zig | 2 +- std/math/atanh.zig | 2 +- std/math/big.zig | 5 + std/math/big/index.zig | 5 - std/math/big/int.zig | 2 +- std/math/cbrt.zig | 2 +- std/math/ceil.zig | 2 +- std/math/{complex/index.zig => complex.zig} | 82 +++---- std/math/complex/abs.zig | 2 +- std/math/complex/acos.zig | 2 +- std/math/complex/acosh.zig | 2 +- std/math/complex/arg.zig | 2 +- std/math/complex/asin.zig | 2 +- std/math/complex/asinh.zig | 2 +- std/math/complex/atan.zig | 2 +- std/math/complex/atanh.zig | 2 +- std/math/complex/conj.zig | 2 +- std/math/complex/cos.zig | 2 +- std/math/complex/cosh.zig | 2 +- std/math/complex/exp.zig | 2 +- std/math/complex/ldexp.zig | 2 +- std/math/complex/log.zig | 2 +- std/math/complex/pow.zig | 2 +- std/math/complex/proj.zig | 2 +- std/math/complex/sin.zig | 2 +- std/math/complex/sinh.zig | 2 +- std/math/complex/sqrt.zig | 2 +- std/math/complex/tan.zig | 2 +- std/math/complex/tanh.zig | 2 +- std/math/copysign.zig | 2 +- std/math/cos.zig | 2 +- std/math/cosh.zig | 2 +- std/math/exp.zig | 2 +- std/math/exp2.zig | 2 +- std/math/expm1.zig | 2 +- std/math/expo2.zig | 2 +- std/math/fabs.zig | 2 +- std/math/floor.zig | 2 +- std/math/fma.zig | 2 +- std/math/frexp.zig | 2 +- std/math/hypot.zig | 2 +- std/math/ilogb.zig | 2 +- std/math/inf.zig | 2 +- std/math/isfinite.zig | 2 +- std/math/isinf.zig | 2 +- std/math/isnan.zig | 2 +- std/math/isnormal.zig | 2 +- std/math/ln.zig | 2 +- std/math/log.zig | 2 +- std/math/log10.zig | 2 +- std/math/log1p.zig | 2 +- std/math/log2.zig | 2 +- std/math/modf.zig | 2 +- std/math/nan.zig | 2 +- std/math/pow.zig | 2 +- std/math/powi.zig | 2 +- std/math/round.zig | 2 +- std/math/scalbn.zig | 2 +- std/math/signbit.zig | 2 +- std/math/sin.zig | 2 +- std/math/sinh.zig | 2 +- std/math/sqrt.zig | 2 +- std/math/tan.zig | 2 +- std/math/tanh.zig | 2 +- std/math/trunc.zig | 2 +- std/mem.zig | 2 +- std/{meta/index.zig => meta.zig} | 4 +- std/meta/trait.zig | 4 +- std/mutex.zig | 2 +- std/net.zig | 2 +- std/{os/index.zig => os.zig} | 56 ++--- std/os/child_process.zig | 2 +- std/os/darwin.zig | 2 +- std/os/file.zig | 2 +- std/os/{freebsd/index.zig => freebsd.zig} | 5 +- std/os/get_app_data_dir.zig | 2 +- std/os/get_user_id.zig | 2 +- std/os/{linux/index.zig => linux.zig} | 14 +- std/os/linux/arm64.zig | 2 +- std/os/linux/test.zig | 2 +- std/os/linux/vdso.zig | 2 +- std/os/linux/x86_64.zig | 2 +- std/os/{netbsd/index.zig => netbsd.zig} | 5 +- std/os/path.zig | 2 +- std/os/test.zig | 2 +- std/os/time.zig | 2 +- std/os/{windows/index.zig => windows.zig} | 18 +- std/os/windows/advapi32.zig | 2 +- std/os/windows/kernel32.zig | 8 +- std/os/windows/ntdll.zig | 2 +- std/os/windows/ole32.zig | 2 +- std/os/windows/shell32.zig | 2 +- std/os/windows/util.zig | 2 +- std/os/zen.zig | 2 +- std/pdb.zig | 2 +- std/priority_queue.zig | 2 +- std/{rand/index.zig => rand.zig} | 4 +- std/rand/ziggurat.zig | 2 +- std/rb.zig | 2 +- std/segmented_list.zig | 2 +- std/sort.zig | 2 +- .../index.zig => compiler_rt.zig} | 144 ++++++------- std/special/compiler_rt/addXf3.zig | 2 +- std/special/compiler_rt/divti3.zig | 2 +- std/special/compiler_rt/muloti4.zig | 2 +- std/special/compiler_rt/multi3.zig | 2 +- std/special/compiler_rt/udivmodti4.zig | 2 +- std/special/compiler_rt/umodti3.zig | 2 +- std/spinlock.zig | 2 +- std/statically_initialized_mutex.zig | 13 +- std/{index.zig => std.zig} | 44 ++-- std/testing.zig | 2 +- std/unicode.zig | 2 +- std/zig.zig | 16 ++ std/zig/ast.zig | 2 +- std/zig/bench.zig | 2 +- std/zig/index.zig | 16 -- std/zig/parse.zig | 2 +- std/zig/parse_string_literal.zig | 2 +- std/zig/render.zig | 2 +- std/zig/tokenizer.zig | 2 +- test/stage1/behavior.zig | 4 +- ...g => namespace_depends_on_compile_var.zig} | 4 +- .../{pub_enum/index.zig => pub_enum.zig} | 2 +- 198 files changed, 622 insertions(+), 640 deletions(-) create mode 100644 std/atomic.zig delete mode 100644 std/atomic/index.zig rename std/{c/index.zig => c.zig} (93%) create mode 100644 std/crypto.zig delete mode 100644 std/crypto/index.zig rename std/{debug/index.zig => debug.zig} (99%) rename std/{fmt/index.zig => fmt.zig} (99%) rename std/fmt/{errol/index.zig => errol.zig} (98%) rename std/{hash/index.zig => hash.zig} (51%) rename std/{math/index.zig => math.zig} (84%) create mode 100644 std/math/big.zig delete mode 100644 std/math/big/index.zig rename std/math/{complex/index.zig => complex.zig} (64%) rename std/{meta/index.zig => meta.zig} (99%) rename std/{os/index.zig => os.zig} (99%) rename std/os/{freebsd/index.zig => freebsd.zig} (99%) rename std/os/{linux/index.zig => linux.zig} (99%) rename std/os/{netbsd/index.zig => netbsd.zig} (99%) rename std/os/{windows/index.zig => windows.zig} (96%) rename std/{rand/index.zig => rand.zig} (99%) rename std/special/{compiler_rt/index.zig => compiler_rt.zig} (79%) rename std/{index.zig => std.zig} (76%) create mode 100644 std/zig.zig delete mode 100644 std/zig/index.zig rename test/stage1/behavior/{namespace_depends_on_compile_var/index.zig => namespace_depends_on_compile_var.zig} (68%) rename test/stage1/behavior/{pub_enum/index.zig => pub_enum.zig} (85%) diff --git a/.builds/freebsd.yml b/.builds/freebsd.yml index 5e94a83a3a5b97fac22688be4d79e2bfab01082c..79dfab50c8e434a6cdbe5dad6d7a6544c622902e 100644 --- a/.builds/freebsd.yml +++ b/.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 diff --git a/CMakeLists.txt b/CMakeLists.txt index f2d9f392ef2a3461c883f5cb575fecd0f7a38009..8c8defa5ea6f9b4c577c6a9c26ec2a913b7cf007 100644 --- a/CMakeLists.txt +++ b/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" diff --git a/build.zig b/build.zig index 756ec5370885c30afb560c09bdac8e50e82e99fc..6acf08a0e5f238e8d609ac87bf2d5d3ce53c8e4b 100644 --- a/build.zig +++ b/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)); diff --git a/src-self-hosted/compilation.zig b/src-self-hosted/compilation.zig index a59588353c5a1b2186e1aa0e5467f55f2c99128e..478edce020011ef9825520f2d6ec6707bcf4ff4d 100644 --- a/src-self-hosted/compilation.zig +++ b/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(), ".", ""); diff --git a/src-self-hosted/introspect.zig b/src-self-hosted/introspect.zig index 0a7f63b4f17c2a476f6473ccede8e4a8d3e047b4..8f859a82cea502e814b8b2e738f1be0b96fc8d78 100644 --- a/src-self-hosted/introspect.zig +++ b/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); diff --git a/src/codegen.cpp b/src/codegen.cpp index 071dd1fde4ef07dece8183bdbdc2a3cf488afef9..89e370329f980b06917454e2fa983d81930f5428 100644 --- a/src/codegen.cpp +++ b/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(".", "", ""); diff --git a/src/compiler.cpp b/src/compiler.cpp index 0d4dff5d506d7523a3a7ac53a01938c90a882e98..8c2f9cdf608766639316a300de1624011dccc46c 100644 --- a/src/compiler.cpp +++ b/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; diff --git a/src/link.cpp b/src/link.cpp index 2e30dc6230b7684c0514ac9e0bc44f9eac055551..bd1879da1ae8412a2ca911ec0d1e417ecd620c3e 100644 --- a/src/link.cpp +++ b/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); } diff --git a/std/array_list.zig b/std/array_list.zig index e2535d639337558dd2af34ec1d76a9275820f330..2c9da50972049ce491283c620e7c9bca3d7bbd17 100644 --- a/std/array_list.zig +++ b/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); } diff --git a/std/atomic.zig b/std/atomic.zig new file mode 100644 index 0000000000000000000000000000000000000000..6f7b4fe75d1defdf2ee8d7ecc60cce89398c31d6 --- /dev/null +++ b/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"); +} diff --git a/std/atomic/index.zig b/std/atomic/index.zig deleted file mode 100644 index a94cff19733efc82d340ffe5357e2144b06f3671..0000000000000000000000000000000000000000 --- a/std/atomic/index.zig +++ /dev/null @@ -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"); -} diff --git a/std/atomic/queue.zig b/std/atomic/queue.zig index bdc86c0981ab43ee2d9111692bdcf013e4896cb2..431a96e64b2eead1ee33da96b08eab1705f5062f 100644 --- a/std/atomic/queue.zig +++ b/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; diff --git a/std/atomic/stack.zig b/std/atomic/stack.zig index 4d0d5075e048061798d93cf666a5293c17203f12..8ae6c997aad6c2ab6ee7328b530b3ca7dc9a88f5 100644 --- a/std/atomic/stack.zig +++ b/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), diff --git a/std/base64.zig b/std/base64.zig index cfe8ea95f88ae41570715657477f8cddfa0fb6b0..0e44f9d4fef1ebf4da99dd5aedc3534fdc76778e 100644 --- a/std/base64.zig +++ b/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; diff --git a/std/buf_map.zig b/std/buf_map.zig index f8d3d5e04de45ae015109e35af84273a8955d607..be0666d972fad6e39b957f3780b4bc7516f88fca 100644 --- a/std/buf_map.zig +++ b/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; diff --git a/std/buf_set.zig b/std/buf_set.zig index 484b4953b922f57ba76e846214298a67ff248db3..807b9db35dda13bf9b3e66944439263d6c0bc27c 100644 --- a/std/buf_set.zig +++ b/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; diff --git a/std/buffer.zig b/std/buffer.zig index 371655f1e58c5401eeaccd59f2650ea487a9fd70..8706dfc320601dffd6902d00862e50f10e14b5a6 100644 --- a/std/buffer.zig +++ b/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; diff --git a/std/build.zig b/std/build.zig index b7f76a53af68479cca98c51583716ff407873ac2..f2e53cce104f536a00a60139980623c082c301f6 100644 --- a/std/build.zig +++ b/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; diff --git a/std/build/fmt.zig b/std/build/fmt.zig index ec0536dd340d45fe1508a5263595332945e1487e..f3b8e081804d3fb719455cb1bd19bef88a16a902 100644 --- a/std/build/fmt.zig +++ b/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; diff --git a/std/c/index.zig b/std/c.zig similarity index 93% rename from std/c/index.zig rename to std/c.zig index 74cdd884cac0fac76194c15734a4877bbd70c9d6..c7c8a9c5509d17dade6c1f5bc19a0e5910c77099 100644 --- a/std/c/index.zig +++ b/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 diff --git a/std/c/darwin.zig b/std/c/darwin.zig index 940d949985cbe31e2be2baa28ae3ff926129ee65..0e92e8d41111d5c4035c7e9eab86a6724ac32663 100644 --- a/std/c/darwin.zig +++ b/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 { diff --git a/std/coff.zig b/std/coff.zig index 53bd2a4b7a88a0a3a916205fe0f1b603d143956b..c31d2d8233b9985ef930485e9a34aafdbf6c9e8a 100644 --- a/std/coff.zig +++ b/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; diff --git a/std/crypto.zig b/std/crypto.zig new file mode 100644 index 0000000000000000000000000000000000000000..2429441fc7932ca848ba8229fc2d3ca1032a885f --- /dev/null +++ b/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"); +} diff --git a/std/crypto/blake2.zig b/std/crypto/blake2.zig index 6eebaf7a962211a85861ed2dbcb870bda008e1f8..e9f617261f562cf7329111bdb10d9fc161fa68ba 100644 --- a/std/crypto/blake2.zig +++ b/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"); diff --git a/std/crypto/chacha20.zig b/std/crypto/chacha20.zig index d964f4c03d023c93d0647c2e5da1766c7c5d24a6..78ef700bdfe029af9590f78c05e61d80c81acd8b 100644 --- a/std/crypto/chacha20.zig +++ b/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; diff --git a/std/crypto/hmac.zig b/std/crypto/hmac.zig index 51dda1b1ea2e8f5dde3b27d8e0cc8ad09f5f6a2e..69c1b86386cb362fd5c58b0e5eb32b2814d1dcad 100644 --- a/std/crypto/hmac.zig +++ b/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; diff --git a/std/crypto/index.zig b/std/crypto/index.zig deleted file mode 100644 index 3855bd8dd37135e626cadbc2b241ab554d7b36bb..0000000000000000000000000000000000000000 --- a/std/crypto/index.zig +++ /dev/null @@ -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"); -} diff --git a/std/crypto/md5.zig b/std/crypto/md5.zig index fe6877a58fee75db6bbbc4ced8b7c91f298bb74f..d27a3c1c337eb143fc0c8db5e829d92a49c14620 100644 --- a/std/crypto/md5.zig +++ b/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, diff --git a/std/crypto/poly1305.zig b/std/crypto/poly1305.zig index 64adb17c454a46b1c8e3017fac4c6f51c5e0f635..bd0b33e5860b0f85518a0fe1f5ce3ec3210208c2 100644 --- a/std/crypto/poly1305.zig +++ b/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; diff --git a/std/crypto/sha1.zig b/std/crypto/sha1.zig index 42beba62050ac13beef9d59eba21288a7c05a5c2..ee5c118b134eaa212fcf4f38abb5fba375404c06 100644 --- a/std/crypto/sha1.zig +++ b/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 { diff --git a/std/crypto/sha2.zig b/std/crypto/sha2.zig index 615dd4a2219e43a34d82dfbc14f25470242dc097..37b0b65dc62475f38a31db533b6058354cbfda00 100644 --- a/std/crypto/sha2.zig +++ b/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"); diff --git a/std/crypto/sha3.zig b/std/crypto/sha3.zig index 11d8e4be50bd19408c57f580cc881bb00abd6f01..beebb3e65d433383a05ed309fcfa5912e734e769 100644 --- a/std/crypto/sha3.zig +++ b/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"); diff --git a/std/crypto/test.zig b/std/crypto/test.zig index 258cdf7320580d5feabbdb8b110eb5057ba4924b..a0ddad6c83136bb9890b0f6d6df09ef95d134a1c 100644 --- a/std/crypto/test.zig +++ b/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; diff --git a/std/crypto/throughput_test.zig b/std/crypto/throughput_test.zig index 10ef1bcd486682d9e6951344d54e2b1e6b08c0c7..73a2a86124699822409fd5edd113487d5e94a87d 100644 --- a/std/crypto/throughput_test.zig +++ b/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; diff --git a/std/crypto/x25519.zig b/std/crypto/x25519.zig index 9349569f97aa271c8ebc970442926fdc2cdc79d7..5d5d31267d54eb84710dc4540a8fc1c74f01f995 100644 --- a/std/crypto/x25519.zig +++ b/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; diff --git a/std/cstr.zig b/std/cstr.zig index abd2eac48fc8fe7ac80b922a626c91d5b77ee5f0..49d63737325cec4dc8eebb13d9c273fe04f5febb 100644 --- a/std/cstr.zig +++ b/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; diff --git a/std/debug/index.zig b/std/debug.zig similarity index 99% rename from std/debug/index.zig rename to std/debug.zig index 1523eea57c9fd3b5b6a9da6dd5354c7cfd16ae55..df35a8e773257d20deb7ac0b7c28a523ca8a5287 100644 --- a/std/debug/index.zig +++ b/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) { diff --git a/std/debug/failing_allocator.zig b/std/debug/failing_allocator.zig index e16dd21db45324ce3c75d92259b96aa8a0f6cce3..82093dffda2f8a0101de2483fe763bafc939d315 100644 --- a/std/debug/failing_allocator.zig +++ b/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 diff --git a/std/dynamic_library.zig b/std/dynamic_library.zig index 66026b1f29005e12039f449a8b20fcc3d6449622..698b0eb21652558224e6ea4988efb304c1d36612 100644 --- a/std/dynamic_library.zig +++ b/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; diff --git a/std/elf.zig b/std/elf.zig index 6a564c3283fdb022f5ad189bd4dd551b2171bbd1..d0ec5fb2ae14d7c78ba965cbd94e82bad0233a07 100644 --- a/std/elf.zig +++ b/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; diff --git a/std/event/channel.zig b/std/event/channel.zig index 4af9bf612b6b2337455015072743cfa119ad79ab..be5af497740245eb6e9becd274fd68b56222c62b 100644 --- a/std/event/channel.zig +++ b/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; diff --git a/std/event/fs.zig b/std/event/fs.zig index 653594557396aa8b073c054394f20b97a9694472..b923651b1b918e7fcc00d758acaabc8b200d8eee 100644 --- a/std/event/fs.zig +++ b/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"), diff --git a/std/event/future.zig b/std/event/future.zig index 66acac5ad7376ec1595aa8e7cb45d94ed3138798..0e1b9288986d9efd52d36c5400fe9c054e9fd6b6 100644 --- a/std/event/future.zig +++ b/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"); diff --git a/std/event/group.zig b/std/event/group.zig index 25e79640cb1d4ad1ec93828ca7279dde2cdd8726..455d1bd60cf9f3226688794aa8ff0b73d5a5ba9f 100644 --- a/std/event/group.zig +++ b/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; diff --git a/std/event/io.zig b/std/event/io.zig index b11550f7aa6fa328d29ef64b61fab15ee8f751cc..29419a792e995435e3f6dc2539ac3597c3afc076 100644 --- a/std/event/io.zig +++ b/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; diff --git a/std/event/lock.zig b/std/event/lock.zig index d6a246cee5340d31ce751f885166419057cde156..031b2adf198475d3ac7ab5448e6cfbdc9b85f7d3 100644 --- a/std/event/lock.zig +++ b/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; diff --git a/std/event/locked.zig b/std/event/locked.zig index 6718b1bf9cea8d2f8055c93312abbd48440e5d18..1ceaa33530be149ed6d80a37149e9d2b9a6aa63a 100644 --- a/std/event/locked.zig +++ b/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; diff --git a/std/event/loop.zig b/std/event/loop.zig index 55a1538f0cb82afdeb9178cadbc58fdbead3dc24..a327d0379288711ae6db92d07ae0907944d841c0 100644 --- a/std/event/loop.zig +++ b/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; diff --git a/std/event/net.zig b/std/event/net.zig index 48461c3d815ccef39bbe8118fe53b5b96ba9cbf3..687c1199205c4ac85146e5480087594f2cde6206 100644 --- a/std/event/net.zig +++ b/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; diff --git a/std/event/rwlock.zig b/std/event/rwlock.zig index 26ccd12b73362bb3a6b0a0fe4d44e56b89e3a1bb..25b0f0e74b6bf515be88e2db6fe52a013e028d0d 100644 --- a/std/event/rwlock.zig +++ b/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; diff --git a/std/event/rwlocked.zig b/std/event/rwlocked.zig index d305b1791eb32cd8ac3cc90c980b79baa100ad29..0448e0298e791f4ea8768feea0d39446ec48f60c 100644 --- a/std/event/rwlocked.zig +++ b/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; diff --git a/std/fmt/index.zig b/std/fmt.zig similarity index 99% rename from std/fmt/index.zig rename to std/fmt.zig index 4f864b36626de9c733807b75eb9ce870b62c4df7..e01ba2033b6af33749699262d29d1432c0bb2eff 100644 --- a/std/fmt/index.zig +++ b/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) { diff --git a/std/fmt/errol/index.zig b/std/fmt/errol.zig similarity index 98% rename from std/fmt/errol/index.zig rename to std/fmt/errol.zig index 0fdb1c4ab89b23dda123258f68b7b9cd94361e1d..9304c548743a67da431b4be55c0f7cb95bbb94ca 100644 --- a/std/fmt/errol/index.zig +++ b/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; diff --git a/std/fmt/parse_float.zig b/std/fmt/parse_float.zig index de9619efe2b131eb43ba52484c9c3cf4f8efebbd..c13977dc4254bc1128f1b11c0e59a60ce174da72 100644 --- a/std/fmt/parse_float.zig +++ b/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; diff --git a/std/hash/index.zig b/std/hash.zig similarity index 51% rename from std/hash/index.zig rename to std/hash.zig index 8cce35f3c50ea0f3d8160cbdeb606555442821b8..19ee62824d93efe0a69c980ae01c57ad54e61148 100644 --- a/std/hash/index.zig +++ b/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"); } diff --git a/std/hash/adler.zig b/std/hash/adler.zig index 78f960367a546336c325ea976169d413bd76bc07..e95203cc6c3e1a435363b60e3751346ec6ad3d74 100644 --- a/std/hash/adler.zig +++ b/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 { diff --git a/std/hash/crc.zig b/std/hash/crc.zig index 9bea358bf15db81fa8639fc271d477294d262586..53b4262c93599f70ae07bb89a6710ba5740d0f0f 100644 --- a/std/hash/crc.zig +++ b/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; diff --git a/std/hash/fnv.zig b/std/hash/fnv.zig index 6876b636f67852d58cb42e276a5356a4d419b98c..8094134e193e5d9588f67040ce569080eb50b185 100644 --- a/std/hash/fnv.zig +++ b/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); diff --git a/std/hash/siphash.zig b/std/hash/siphash.zig index c9a6128d35b7dab34fd21986b63dad3df5f54880..77194c3e037ea7159eb4c5b8783bdb6f3d126ddc 100644 --- a/std/hash/siphash.zig +++ b/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; diff --git a/std/hash_map.zig b/std/hash_map.zig index 6ae9e8e2c327b9291c94170141cb2384749c0916..d31fcdb59764e2c61784ceec2e2cd578354c0d73 100644 --- a/std/hash_map.zig +++ b/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; diff --git a/std/heap.zig b/std/heap.zig index e257977f9d72e5d3195aafac1a9e0224e6daae64..e03e77a39cb38bc9c20c7158730032ba8d8d9710 100644 --- a/std/heap.zig +++ b/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; diff --git a/std/io.zig b/std/io.zig index f6e3790af6f6e777bbf52ca8667e2b31c401bfe3..7756f361169f0eb56a5c8fee341373556ad3ce44 100644 --- a/std/io.zig +++ b/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; diff --git a/std/io/seekable_stream.zig b/std/io/seekable_stream.zig index a766f4fb8981a48a1a5819aaa8b026d25a6a7d4c..5529e42ff1d9565056e7315a48fc8c4d0d83a191 100644 --- a/std/io/seekable_stream.zig +++ b/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 { diff --git a/std/io_test.zig b/std/io_test.zig index 87b970edf87f5c82517839e394ea844d6d85bff3..3c4c15ba1205818e1407af8e9c2ee911e04f927d 100644 --- a/std/io_test.zig +++ b/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, diff --git a/std/json.zig b/std/json.zig index dd053e7635eeec8f673769e791d84c9c1f2ba326..551c3a8da70ddee261bdea75e01b4bae979ffa82 100644 --- a/std/json.zig +++ b/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; diff --git a/std/json_test.zig b/std/json_test.zig index edc50be8cb3e3ef1b4a1639b7524f06fd57fa3d2..a323e6e9799183af36e897fb513c7bd0f1a83b2c 100644 --- a/std/json_test.zig +++ b/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)); diff --git a/std/lazy_init.zig b/std/lazy_init.zig index a09168786ba0bc73cc9e31c24e6636bbb83ecc96..7beabb9cdeeb948c3fe6b4107009dfd091af4907 100644 --- a/std/lazy_init.zig +++ b/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; diff --git a/std/linked_list.zig b/std/linked_list.zig index 86e5cd056ef61503814464c5a6db4b04ae5ba211..c4ad525913f528cf02564ac3b58c1c28489b867a 100644 --- a/std/linked_list.zig +++ b/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; diff --git a/std/math/index.zig b/std/math.zig similarity index 84% rename from std/math/index.zig rename to std/math.zig index 89f228d35e9a86c8f70682be172fa8438c2bc57e..cead68577833b5d32c22000dd565c8aa0b5bb3d7 100644 --- a/std/math/index.zig +++ b/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 { diff --git a/std/math/acos.zig b/std/math/acos.zig index 734f7a8651679d7503e23f615588cf53ebab7633..763d9d8abde256bf4fe361cc305e519905aca952 100644 --- a/std/math/acos.zig +++ b/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; diff --git a/std/math/acosh.zig b/std/math/acosh.zig index a9c4a908ef15aaf72ffab1c852e34218f97c18d4..a2a99268635d6972e279f85b883d8de5e812f137 100644 --- a/std/math/acosh.zig +++ b/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; diff --git a/std/math/asin.zig b/std/math/asin.zig index c9dbdf704f0b051f64723855ca0aa7f1c2deb0d3..b01a1ac49ea067aae9154df67a2bd9a9a656fe98 100644 --- a/std/math/asin.zig +++ b/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; diff --git a/std/math/asinh.zig b/std/math/asinh.zig index 05bd8d008ec9c3e63665c06202c2f4e2c8f28660..cef9bfb23f520cdcbcedccbdfe22bc26168bfed4 100644 --- a/std/math/asinh.zig +++ b/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; diff --git a/std/math/atan.zig b/std/math/atan.zig index 72d17b4db2b25825dbedf64280b352dbf7249c41..ba5a11dd10dc794a4164f686135084c703fd778a 100644 --- a/std/math/atan.zig +++ b/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; diff --git a/std/math/atan2.zig b/std/math/atan2.zig index 6e1f67cfbba5642c51184a4668e5eade684211bc..7f135074021197bd6a00848320bc8b5d2536394d 100644 --- a/std/math/atan2.zig +++ b/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; diff --git a/std/math/atanh.zig b/std/math/atanh.zig index f2feab02070e3df5cf4ce95bbc5440a2066386ce..9056064f5a48c8cc23479b4db159aafe8450b46e 100644 --- a/std/math/atanh.zig +++ b/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; diff --git a/std/math/big.zig b/std/math/big.zig new file mode 100644 index 0000000000000000000000000000000000000000..94b6d864e783827d5fc250b956974003a147382b --- /dev/null +++ b/std/math/big.zig @@ -0,0 +1,5 @@ +pub use @import("big/int.zig"); + +test "math.big" { + _ = @import("big/int.zig"); +} diff --git a/std/math/big/index.zig b/std/math/big/index.zig deleted file mode 100644 index 26fa538c4f0418c8e727686a6f2be2bccb35d14a..0000000000000000000000000000000000000000 --- a/std/math/big/index.zig +++ /dev/null @@ -1,5 +0,0 @@ -pub use @import("int.zig"); - -test "math.big" { - _ = @import("int.zig"); -} diff --git a/std/math/big/int.zig b/std/math/big/int.zig index f21e5df8aa4f0aa37f2c1bcf057b65caf6e5992d..7fca4a147fc478a610b1c5c3f50a4e764085b5e0 100644 --- a/std/math/big/int.zig +++ b/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; diff --git a/std/math/cbrt.zig b/std/math/cbrt.zig index 957e026af45e65267728ae6e566bd2453502849d..94972552697a80858f1be15218995b1002dfbb99 100644 --- a/std/math/cbrt.zig +++ b/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; diff --git a/std/math/ceil.zig b/std/math/ceil.zig index 5c6b98b2ca96f18d84b7bc54a009da59fcc79c9d..da83e0ec59ed737bfb4bb41e91e6a77055c66ac5 100644 --- a/std/math/ceil.zig +++ b/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; diff --git a/std/math/complex/index.zig b/std/math/complex.zig similarity index 64% rename from std/math/complex/index.zig rename to std/math/complex.zig index ffbf14d83e68fa926d0cb62fc66b38ecfa02c546..cc0573b2271f7850a9dcaead084c329556050b28 100644 --- a/std/math/complex/index.zig +++ b/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"); } diff --git a/std/math/complex/abs.zig b/std/math/complex/abs.zig index 245d67d4c57fa8684cfae99b5274f5ff8a68da5c..e1368d6ef64414793d4639fe5d8bfff9fab30e98 100644 --- a/std/math/complex/abs.zig +++ b/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; diff --git a/std/math/complex/acos.zig b/std/math/complex/acos.zig index 1b314bc31a80e76c1d8af410ed32b59693405dcd..8aed26a71b5e3ed3be3d42cab1679ce60ee2d750 100644 --- a/std/math/complex/acos.zig +++ b/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; diff --git a/std/math/complex/acosh.zig b/std/math/complex/acosh.zig index 0e4c0121f4dc13867a0a644f18b838043905161e..e72bf431fe528a3f89fe1c6abbf8824de32e798f 100644 --- a/std/math/complex/acosh.zig +++ b/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; diff --git a/std/math/complex/arg.zig b/std/math/complex/arg.zig index be117a59401b685d92f024b6bae8fc8fca640a62..0a2441d1fdf3c7382699d9aa2ccb8535828f4fb6 100644 --- a/std/math/complex/arg.zig +++ b/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; diff --git a/std/math/complex/asin.zig b/std/math/complex/asin.zig index cf802ea206418a66c2dac3992340612b860c0686..6be775d7484c997849a0dead3b2892df9f4bde81 100644 --- a/std/math/complex/asin.zig +++ b/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; diff --git a/std/math/complex/asinh.zig b/std/math/complex/asinh.zig index 0386a636b0e50bb245aa62fc3e83974c861b07ad..8e0903675070c8660e859ce88804f609c612f2c3 100644 --- a/std/math/complex/asinh.zig +++ b/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; diff --git a/std/math/complex/atan.zig b/std/math/complex/atan.zig index 8e60e58e43faca85af9d85657a3e63cc9a658c2e..6b83adbd9761d392e993aa31cc201468ede8a2b1 100644 --- a/std/math/complex/atan.zig +++ b/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; diff --git a/std/math/complex/atanh.zig b/std/math/complex/atanh.zig index 5b18fe1992f7d92da57a787f412eefac1f996346..8edfb6e78e758d86ed49caaaba2fbe02035f5f61 100644 --- a/std/math/complex/atanh.zig +++ b/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; diff --git a/std/math/complex/conj.zig b/std/math/complex/conj.zig index 143543f9e7e81058f08c4f0dd573319eb9761a88..7a42d365eaf8b8b5b960134bf33c3e1d738be868 100644 --- a/std/math/complex/conj.zig +++ b/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; diff --git a/std/math/complex/cos.zig b/std/math/complex/cos.zig index 658d19c3b6ecac46dac8c0d42ba036daac5f3ce5..71f9603c75841ad017d368b531c9f5cd01226860 100644 --- a/std/math/complex/cos.zig +++ b/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; diff --git a/std/math/complex/cosh.zig b/std/math/complex/cosh.zig index 5ce10b03f8396caf592252a401c8ac7be5663f25..9806e411709a3130810e94f3aa950918f3114be5 100644 --- a/std/math/complex/cosh.zig +++ b/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; diff --git a/std/math/complex/exp.zig b/std/math/complex/exp.zig index 9ded698d088eda5fe4b2a99f16cc4866a4a1e60d..c74ac2fc08fc4359a23296e6b462a71466c05c2c 100644 --- a/std/math/complex/exp.zig +++ b/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; diff --git a/std/math/complex/ldexp.zig b/std/math/complex/ldexp.zig index e919ef6bec5728b03e3e0c1a658baf74f9d01ee1..6b4306bf77277e944c31065ee179ed8abd9f83db 100644 --- a/std/math/complex/ldexp.zig +++ b/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; diff --git a/std/math/complex/log.zig b/std/math/complex/log.zig index 360bb7d21ea624610c4c6cc08de89bec534fc6a7..2b43a6970f5b09701196ff8fd7b0e86db3519c3b 100644 --- a/std/math/complex/log.zig +++ b/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; diff --git a/std/math/complex/pow.zig b/std/math/complex/pow.zig index bd625626c8790ff428e25455253005895a6ddad8..9174bb36260aca9933b1c2118524bda535c46d11 100644 --- a/std/math/complex/pow.zig +++ b/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; diff --git a/std/math/complex/proj.zig b/std/math/complex/proj.zig index d31006129e2f7edfd515a9414e5b379d3aa8eb4b..aadcff6ff664e4da4636a2ff01934f9ff2b42ea1 100644 --- a/std/math/complex/proj.zig +++ b/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; diff --git a/std/math/complex/sin.zig b/std/math/complex/sin.zig index 9d54ab0969691673589e893068f84faca065112b..049631f31e361557a4e22898316f2fdb1ba140cb 100644 --- a/std/math/complex/sin.zig +++ b/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; diff --git a/std/math/complex/sinh.zig b/std/math/complex/sinh.zig index 469ea6067a3f3900e0f15616e215c2026ea28fad..0b656e53545dfd12123f2cc22803faea2e62b298 100644 --- a/std/math/complex/sinh.zig +++ b/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; diff --git a/std/math/complex/sqrt.zig b/std/math/complex/sqrt.zig index 60f6061baab09f6e2e2d390cb0ca9342c5661d51..e935d0b238566e9dcfafec8e61780369195c7a77 100644 --- a/std/math/complex/sqrt.zig +++ b/std/math/complex/sqrt.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; diff --git a/std/math/complex/tan.zig b/std/math/complex/tan.zig index db345805985b9e64d672d8178d4ef1cc3ea4bc1b..45e2873eb6ee5460e737888e39086107cb31dd85 100644 --- a/std/math/complex/tan.zig +++ b/std/math/complex/tan.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; diff --git a/std/math/complex/tanh.zig b/std/math/complex/tanh.zig index 03ab431312686e155dd18354bde966c6daeb0ed2..de905ee3f692432c4c8d2aa7a47c5da7ee2a98e9 100644 --- a/std/math/complex/tanh.zig +++ b/std/math/complex/tanh.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; diff --git a/std/math/copysign.zig b/std/math/copysign.zig index dbf8f6e1ef911e8431d4d7565b095243c5c49b07..ff8140b3ab9efa23fb3b9725b00edf165f1d78da 100644 --- a/std/math/copysign.zig +++ b/std/math/copysign.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const maxInt = std.math.maxInt; diff --git a/std/math/cos.zig b/std/math/cos.zig index 7783ddc09be9139600d781882ab7b1ba2b5a5517..947948289490af680df2a582cdb1cbce1ad73727 100644 --- a/std/math/cos.zig +++ b/std/math/cos.zig @@ -4,7 +4,7 @@ // - cos(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; diff --git a/std/math/cosh.zig b/std/math/cosh.zig index 57c5eef828484700c4c3810a8f028b91aadb8587..eb3082e5fa179ac605ca911d607c8e84688c76ad 100644 --- a/std/math/cosh.zig +++ b/std/math/cosh.zig @@ -5,7 +5,7 @@ // - cosh(nan) = nan const builtin = @import("builtin"); -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expo2 = @import("expo2.zig").expo2; const expect = std.testing.expect; diff --git a/std/math/exp.zig b/std/math/exp.zig index cf8fd62d806e9aff92110a5e90813e7999b5cbd6..aabccffd0b4ed59d0996f290ab9a5c645ea5faa5 100644 --- a/std/math/exp.zig +++ b/std/math/exp.zig @@ -3,7 +3,7 @@ // - exp(+inf) = +inf // - exp(nan) = nan -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const assert = std.debug.assert; const builtin = @import("builtin"); diff --git a/std/math/exp2.zig b/std/math/exp2.zig index ba0001a09adb8aaa62a2c66f7c2917dc14a6bd59..392d45bf68baec91cd2b0a35d0f7a7cdf22a677c 100644 --- a/std/math/exp2.zig +++ b/std/math/exp2.zig @@ -3,7 +3,7 @@ // - exp2(+inf) = +inf // - exp2(nan) = nan -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; diff --git a/std/math/expm1.zig b/std/math/expm1.zig index ba00ec2561966b2f23e6343ff55e772a76ded387..b83cc3e82e854e4c536dc178f9f37e310586be06 100644 --- a/std/math/expm1.zig +++ b/std/math/expm1.zig @@ -5,7 +5,7 @@ // - expm1(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; diff --git a/std/math/expo2.zig b/std/math/expo2.zig index 15b80c710cc3d9158de94a2f557f7037da685cb7..57e2bf34c940734f559f3b8c7b4466da4611b50f 100644 --- a/std/math/expo2.zig +++ b/std/math/expo2.zig @@ -1,4 +1,4 @@ -const math = @import("index.zig"); +const math = @import("../math.zig"); pub fn expo2(x: var) @typeOf(x) { const T = @typeOf(x); diff --git a/std/math/fabs.zig b/std/math/fabs.zig index a605f4f33f048cdd4cff4bd481fce035b9d39fb5..e30f788ae736053325fa0f533300a231a38d40bd 100644 --- a/std/math/fabs.zig +++ b/std/math/fabs.zig @@ -3,7 +3,7 @@ // - fabs(+-inf) = +inf // - fabs(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; diff --git a/std/math/floor.zig b/std/math/floor.zig index c7c12e37bad38c4429177ba69c97d3630a469682..ab45a8fee7462967ae5eed1b61d4b75cfe306a8b 100644 --- a/std/math/floor.zig +++ b/std/math/floor.zig @@ -6,7 +6,7 @@ const builtin = @import("builtin"); const expect = std.testing.expect; -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; pub fn floor(x: var) @typeOf(x) { diff --git a/std/math/fma.zig b/std/math/fma.zig index b084cf3cbde2f106774e1d82d0c113caa6c9a28d..a317bc96de08cc07a793223fd74145dba039da6e 100644 --- a/std/math/fma.zig +++ b/std/math/fma.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; diff --git a/std/math/frexp.zig b/std/math/frexp.zig index 35f3e081a9036a721de24dad3f191ef623a531f9..35eec315d971bd9985e8a1a611aeeffb0e8019ee 100644 --- a/std/math/frexp.zig +++ b/std/math/frexp.zig @@ -4,7 +4,7 @@ // - frexp(+-inf) = +-inf, 0 // - frexp(nan) = nan, undefined -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; diff --git a/std/math/hypot.zig b/std/math/hypot.zig index dea11e0a61053af2a0d06c35f23c94b6bcdf0967..fddbe7c0688d22572606c50c7aa7b7619cb0c89b 100644 --- a/std/math/hypot.zig +++ b/std/math/hypot.zig @@ -5,7 +5,7 @@ // - hypot(nan, y) = nan // - hypot(x, 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; diff --git a/std/math/ilogb.zig b/std/math/ilogb.zig index e7b64853570c99e99daa0c23052fcae3ebe4a104..2dfd42a62c431ac1babc4cf81c41a08e1fe6cbeb 100644 --- a/std/math/ilogb.zig +++ b/std/math/ilogb.zig @@ -4,7 +4,7 @@ // - ilogb(0) = maxInt(i32) // - ilogb(nan) = maxInt(i32) -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const maxInt = std.math.maxInt; diff --git a/std/math/inf.zig b/std/math/inf.zig index fb7a3489c5bad18a84da9cd2f0517e8a41d1ea5b..e1bfbb197ac9f8461fb233d0fdac761c2fe6602d 100644 --- a/std/math/inf.zig +++ b/std/math/inf.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; pub fn inf(comptime T: type) T { diff --git a/std/math/isfinite.zig b/std/math/isfinite.zig index bf1c9ac63c5bb795d93e0bce2becf36fc5f3f18d..ee8a5ff59072a6eb29cb40101d89545d89cac29f 100644 --- a/std/math/isfinite.zig +++ b/std/math/isfinite.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const maxInt = std.math.maxInt; diff --git a/std/math/isinf.zig b/std/math/isinf.zig index b1e3f7795eb81e328954ae227878dfac8d6bcf7b..1b1759bd36d2556c3275f049290eed87ceb53a8f 100644 --- a/std/math/isinf.zig +++ b/std/math/isinf.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const maxInt = std.math.maxInt; diff --git a/std/math/isnan.zig b/std/math/isnan.zig index e8b03a1e346d06e06b981863d0e8bd63130464fb..7645528ea9d5506be81712352c15de2009f873cd 100644 --- a/std/math/isnan.zig +++ b/std/math/isnan.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const maxInt = std.math.maxInt; diff --git a/std/math/isnormal.zig b/std/math/isnormal.zig index 2c57aea7a9af84b3e65d838a8ce228d7862b6b05..cddcada1d3acfa5e5e661e57e0490f6b081dfa75 100644 --- a/std/math/isnormal.zig +++ b/std/math/isnormal.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const maxInt = std.math.maxInt; diff --git a/std/math/ln.zig b/std/math/ln.zig index 257ce8054ffcd9ee6d6b7b78749a224a6847da67..82b212f00f9c5477e57f62a82f30d51976dcc44a 100644 --- a/std/math/ln.zig +++ b/std/math/ln.zig @@ -5,7 +5,7 @@ // - ln(x) = nan if x < 0 // - ln(nan) = nan -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const builtin = @import("builtin"); diff --git a/std/math/log.zig b/std/math/log.zig index 21cffcc07884bd5cd046a42f8fb4aa186b0d15bf..100dc2fb7f9867a002d5bcf0bb8f95e845ab60f9 100644 --- a/std/math/log.zig +++ b/std/math/log.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const builtin = @import("builtin"); const TypeId = builtin.TypeId; diff --git a/std/math/log10.zig b/std/math/log10.zig index 8055f712801aba0fa6829d22804271b95d1aa624..7311778dddc71ef593547d6a56308340d40082c6 100644 --- a/std/math/log10.zig +++ b/std/math/log10.zig @@ -5,7 +5,7 @@ // - log10(x) = nan if x < 0 // - log10(nan) = nan -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const testing = std.testing; const builtin = @import("builtin"); diff --git a/std/math/log1p.zig b/std/math/log1p.zig index 257e7b90d458cd770b48eef4d3d081cdbde22ed1..c9be1132be92fddf9afb514c00d83675c0006c68 100644 --- a/std/math/log1p.zig +++ b/std/math/log1p.zig @@ -7,7 +7,7 @@ // - log1p(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; diff --git a/std/math/log2.zig b/std/math/log2.zig index 1bb51bf9f9c0c5f8ac5b9b5d77cd149b4223baf6..e2dbf4105a9b074bd75fc5ddc98629adb7867d67 100644 --- a/std/math/log2.zig +++ b/std/math/log2.zig @@ -5,7 +5,7 @@ // - log2(x) = nan if x < 0 // - log2(nan) = nan -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const builtin = @import("builtin"); diff --git a/std/math/modf.zig b/std/math/modf.zig index 2dadda76a91355caab53686372732dd5a20af952..e5a4964e63901dc3f126d94c4305326482fc95f2 100644 --- a/std/math/modf.zig +++ b/std/math/modf.zig @@ -3,7 +3,7 @@ // - modf(+-inf) = +-inf, nan // - modf(nan) = 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; diff --git a/std/math/nan.zig b/std/math/nan.zig index d3ad43da2371930e9504e1189ad01c780b147d5c..1a11a141d5ae7007c7e00de04c069db34021e36b 100644 --- a/std/math/nan.zig +++ b/std/math/nan.zig @@ -1,4 +1,4 @@ -const math = @import("index.zig"); +const math = @import("../math.zig"); pub fn nan(comptime T: type) T { return switch (T) { diff --git a/std/math/pow.zig b/std/math/pow.zig index f037f66d7e0491fc7fa882d35865e5652e1d1473..81bb2d95d5ab009f42d5184c3719951ae1b2f31b 100644 --- a/std/math/pow.zig +++ b/std/math/pow.zig @@ -22,7 +22,7 @@ // pow(x, y) = nan for finite x < 0 and finite non-integer y const builtin = @import("builtin"); -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; diff --git a/std/math/powi.zig b/std/math/powi.zig index dffb564da76db1b7c0d4a09da3c88b490b41d1e6..b7212efcbf7e98e9e7942defe288dcec61f9052c 100644 --- a/std/math/powi.zig +++ b/std/math/powi.zig @@ -9,7 +9,7 @@ // powi(x, y) = Underflow for for y > @sizeOf(x) - 1 y < 0 const builtin = @import("builtin"); -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const assert = std.debug.assert; const testing = std.testing; diff --git a/std/math/round.zig b/std/math/round.zig index 7346b703c9c54422b19d57f65111136f1e207542..39ff56ca79cee60aa5559e567a601d5605887a24 100644 --- a/std/math/round.zig +++ b/std/math/round.zig @@ -6,7 +6,7 @@ const builtin = @import("builtin"); const expect = std.testing.expect; -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; pub fn round(x: var) @typeOf(x) { diff --git a/std/math/scalbn.zig b/std/math/scalbn.zig index d37a8659a945849d014a4cd6e79d39a14b508e6c..d1338f5acb719bec08df3a156957243bfdb72cc7 100644 --- a/std/math/scalbn.zig +++ b/std/math/scalbn.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; diff --git a/std/math/signbit.zig b/std/math/signbit.zig index 728f651aece35456ae9ba7fa11a612cd1c2f33f7..9727152b07947170033e19c58ac465da94d2dd88 100644 --- a/std/math/signbit.zig +++ b/std/math/signbit.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; diff --git a/std/math/sin.zig b/std/math/sin.zig index 5ade6636c73a81fda1f973bfa84e27c398f4bf5f..e25b8a292b66a674df9e69c0842dcaf82980e65f 100644 --- a/std/math/sin.zig +++ b/std/math/sin.zig @@ -5,7 +5,7 @@ // - sin(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; diff --git a/std/math/sinh.zig b/std/math/sinh.zig index 95924ba55a8ca473c1883c82845f3b2b02c21a80..cf4363c4a9e3a69a4433b9e056c9e1617a60ddf3 100644 --- a/std/math/sinh.zig +++ b/std/math/sinh.zig @@ -5,7 +5,7 @@ // - sinh(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; const expo2 = @import("expo2.zig").expo2; diff --git a/std/math/sqrt.zig b/std/math/sqrt.zig index 9996b44b20c83f6f057066fc8a77ad07ac29e561..9062f598a1c7e554b47d2dcb00c99ec59f0a291d 100644 --- a/std/math/sqrt.zig +++ b/std/math/sqrt.zig @@ -5,7 +5,7 @@ // - sqrt(x) = nan if x < 0 // - sqrt(nan) = nan -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const expect = std.testing.expect; const builtin = @import("builtin"); diff --git a/std/math/tan.zig b/std/math/tan.zig index ec4309232082cd76f56fe9220838f16548618ee6..fc11ebdef791443473f2122575e983b26747a667 100644 --- a/std/math/tan.zig +++ b/std/math/tan.zig @@ -5,7 +5,7 @@ // - tan(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; diff --git a/std/math/tanh.zig b/std/math/tanh.zig index a35449a0536aa58888c0b7e0b2eaa86f8be42909..f88ecfdc9c22e7fc696b870f58b6b2f0a10e5cc5 100644 --- a/std/math/tanh.zig +++ b/std/math/tanh.zig @@ -5,7 +5,7 @@ // - sinh(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; const expo2 = @import("expo2.zig").expo2; diff --git a/std/math/trunc.zig b/std/math/trunc.zig index 8c91ccc568d1b5c9ab8a5561efbc31f4430be960..9449d0e7ebb5737657ebf9e21414fa1aa3d79003 100644 --- a/std/math/trunc.zig +++ b/std/math/trunc.zig @@ -4,7 +4,7 @@ // - trunc(+-inf) = +-inf // - trunc(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; diff --git a/std/mem.zig b/std/mem.zig index 39b9701754a90be90259961a2e47635e05c0401c..681054d0874c2d1d65e9e7f77a7e024ae03da2cc 100644 --- a/std/mem.zig +++ b/std/mem.zig @@ -1,4 +1,4 @@ -const std = @import("index.zig"); +const std = @import("std.zig"); const debug = std.debug; const assert = debug.assert; const math = std.math; diff --git a/std/meta/index.zig b/std/meta.zig similarity index 99% rename from std/meta/index.zig rename to std/meta.zig index 652e2d39ec1137b1c9cc34b92aa819730a25d818..215c5dfad859c83005957cbc50a8bceeb739d1ad 100644 --- a/std/meta/index.zig +++ b/std/meta.zig @@ -1,11 +1,11 @@ -const std = @import("../index.zig"); +const std = @import("std.zig"); const builtin = @import("builtin"); const debug = std.debug; const mem = std.mem; const math = std.math; const testing = std.testing; -pub const trait = @import("trait.zig"); +pub const trait = @import("meta/trait.zig"); const TypeId = builtin.TypeId; const TypeInfo = builtin.TypeInfo; diff --git a/std/meta/trait.zig b/std/meta/trait.zig index 7fca5f4dcdb6ca349cf13f260e0772cc66aa09fa..f77619ec3931890a5947bd728542695d02a6d5b7 100644 --- a/std/meta/trait.zig +++ b/std/meta/trait.zig @@ -1,11 +1,11 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const builtin = @import("builtin"); const mem = std.mem; const debug = std.debug; const testing = std.testing; const warn = debug.warn; -const meta = @import("index.zig"); +const meta = @import("../meta.zig"); //This is necessary if we want to return generic functions directly because of how the // the type erasure works. see: #1375 diff --git a/std/mutex.zig b/std/mutex.zig index a13b1c06c7b25dc5b38bb50dd0998444b0ea4a08..2b3ac4e366588ee88e3717984d3d069cc0d9ac1e 100644 --- a/std/mutex.zig +++ b/std/mutex.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; diff --git a/std/net.zig b/std/net.zig index 968c1f019fbe21117ac0e5a7b8653be3f6e9343b..bb292efd83333306021474ca8f8b6e3d6795b226 100644 --- a/std/net.zig +++ b/std/net.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 net = @This(); diff --git a/std/os/index.zig b/std/os.zig similarity index 99% rename from std/os/index.zig rename to std/os.zig index e483bf2dbd3503b96b7885e5aba3054559e933ef..c686c2a0542265aaf2ad581c87669d208e492a72 100644 --- a/std/os/index.zig +++ b/std/os.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("std.zig"); const builtin = @import("builtin"); const Os = builtin.Os; const is_windows = builtin.os == Os.windows; @@ -13,26 +13,26 @@ comptime { } test "std.os" { - _ = @import("child_process.zig"); - _ = @import("darwin.zig"); - _ = @import("darwin/errno.zig"); - _ = @import("get_user_id.zig"); - _ = @import("linux/index.zig"); - _ = @import("path.zig"); - _ = @import("test.zig"); - _ = @import("time.zig"); - _ = @import("windows/index.zig"); - _ = @import("uefi.zig"); - _ = @import("get_app_data_dir.zig"); + _ = @import("os/child_process.zig"); + _ = @import("os/darwin.zig"); + _ = @import("os/darwin/errno.zig"); + _ = @import("os/get_user_id.zig"); + _ = @import("os/linux.zig"); + _ = @import("os/path.zig"); + _ = @import("os/test.zig"); + _ = @import("os/time.zig"); + _ = @import("os/windows.zig"); + _ = @import("os/uefi.zig"); + _ = @import("os/get_app_data_dir.zig"); } -pub const windows = @import("windows/index.zig"); -pub const darwin = @import("darwin.zig"); -pub const linux = @import("linux/index.zig"); -pub const freebsd = @import("freebsd/index.zig"); -pub const netbsd = @import("netbsd/index.zig"); -pub const zen = @import("zen.zig"); -pub const uefi = @import("uefi.zig"); +pub const windows = @import("os/windows.zig"); +pub const darwin = @import("os/darwin.zig"); +pub const linux = @import("os/linux.zig"); +pub const freebsd = @import("os/freebsd.zig"); +pub const netbsd = @import("os/netbsd.zig"); +pub const zen = @import("os/zen.zig"); +pub const uefi = @import("os/uefi.zig"); pub const posix = switch (builtin.os) { Os.linux => linux, @@ -45,10 +45,10 @@ pub const posix = switch (builtin.os) { pub const net = @import("net.zig"); -pub const ChildProcess = @import("child_process.zig").ChildProcess; -pub const path = @import("path.zig"); -pub const File = @import("file.zig").File; -pub const time = @import("time.zig"); +pub const ChildProcess = @import("os/child_process.zig").ChildProcess; +pub const path = @import("os/path.zig"); +pub const File = @import("os/file.zig").File; +pub const time = @import("os/time.zig"); pub const page_size = 4 * 1024; pub const MAX_PATH_BYTES = switch (builtin.os) { @@ -61,10 +61,10 @@ pub const MAX_PATH_BYTES = switch (builtin.os) { else => @compileError("Unsupported OS"), }; -pub const UserInfo = @import("get_user_id.zig").UserInfo; -pub const getUserInfo = @import("get_user_id.zig").getUserInfo; +pub const UserInfo = @import("os/get_user_id.zig").UserInfo; +pub const getUserInfo = @import("os/get_user_id.zig").getUserInfo; -const windows_util = @import("windows/util.zig"); +const windows_util = @import("os/windows/util.zig"); pub const windowsWaitSingle = windows_util.windowsWaitSingle; pub const windowsWrite = windows_util.windowsWrite; pub const windowsIsCygwinPty = windows_util.windowsIsCygwinPty; @@ -88,8 +88,8 @@ pub const WindowsReadError = windows_util.ReadError; pub const FileHandle = if (is_windows) windows.HANDLE else i32; -pub const getAppDataDir = @import("get_app_data_dir.zig").getAppDataDir; -pub const GetAppDataDirError = @import("get_app_data_dir.zig").GetAppDataDirError; +pub const getAppDataDir = @import("os/get_app_data_dir.zig").getAppDataDir; +pub const GetAppDataDirError = @import("os/get_app_data_dir.zig").GetAppDataDirError; const debug = std.debug; const assert = debug.assert; diff --git a/std/os/child_process.zig b/std/os/child_process.zig index 1da0b3492bcae6e5f8df75900f354eba1c5c31bc..653c77623931d42df5f3b306e5e29c29c5833907 100644 --- a/std/os/child_process.zig +++ b/std/os/child_process.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const cstr = std.cstr; const unicode = std.unicode; const io = std.io; diff --git a/std/os/darwin.zig b/std/os/darwin.zig index 3e883abbabd52cc2fee19f6797361edcdbf471d0..4ce631c6ab8747202e69841f6786727b0f5ad302 100644 --- a/std/os/darwin.zig +++ b/std/os/darwin.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const c = std.c; const assert = std.debug.assert; const maxInt = std.math.maxInt; diff --git a/std/os/file.zig b/std/os/file.zig index 23469a3c3740b445e219ad8ac0b57c6d2fdae6c7..c9a0e2b696d27c219ff5d6741f15f0c15c56900e 100644 --- a/std/os/file.zig +++ b/std/os/file.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const builtin = @import("builtin"); const os = std.os; const io = std.io; diff --git a/std/os/freebsd/index.zig b/std/os/freebsd.zig similarity index 99% rename from std/os/freebsd/index.zig rename to std/os/freebsd.zig index 48c0ea5b1ea0b26b46e1264e0ff131afe5fef64a..90e8de1557cbf3988b7b69bef82ea634ff690466 100644 --- a/std/os/freebsd/index.zig +++ b/std/os/freebsd.zig @@ -1,8 +1,8 @@ const builtin = @import("builtin"); -pub use @import("errno.zig"); +pub use @import("freebsd/errno.zig"); -const std = @import("../../index.zig"); +const std = @import("../std.zig"); const c = std.c; const assert = std.debug.assert; @@ -119,7 +119,6 @@ pub const X_OK = 1; // test for execute or search permission pub const W_OK = 2; // test for write permission pub const R_OK = 4; // test for read permission - pub const O_RDONLY = 0x0000; pub const O_WRONLY = 0x0001; pub const O_RDWR = 0x0002; diff --git a/std/os/get_app_data_dir.zig b/std/os/get_app_data_dir.zig index a49d164f4621ccc1e9be6f78bc22cbc3379ad69a..e69c03edb94fb0021df4418248700eacd6ad2c81 100644 --- a/std/os/get_app_data_dir.zig +++ b/std/os/get_app_data_dir.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const builtin = @import("builtin"); const unicode = std.unicode; const mem = std.mem; diff --git a/std/os/get_user_id.zig b/std/os/get_user_id.zig index 6747cc455790f56a5236ca674d031bd769402075..db44c6838fd5cfa2396d39172fe109bb31321ae5 100644 --- a/std/os/get_user_id.zig +++ b/std/os/get_user_id.zig @@ -1,6 +1,6 @@ const builtin = @import("builtin"); const Os = builtin.Os; -const os = @import("index.zig"); +const os = @import("../os.zig"); const io = @import("../io.zig"); pub const UserInfo = struct { diff --git a/std/os/linux/index.zig b/std/os/linux.zig similarity index 99% rename from std/os/linux/index.zig rename to std/os/linux.zig index 3a56461a405d36bf36af93ad5d2eb7bf37345777..e7f822185bc495302a67eae30bf48048c1a81fdc 100644 --- a/std/os/linux/index.zig +++ b/std/os/linux.zig @@ -1,15 +1,15 @@ -const std = @import("../../index.zig"); +const std = @import("../std.zig"); const assert = std.debug.assert; const builtin = @import("builtin"); const maxInt = std.math.maxInt; -const vdso = @import("vdso.zig"); +const vdso = @import("linux/vdso.zig"); pub use switch (builtin.arch) { - builtin.Arch.x86_64 => @import("x86_64.zig"), - builtin.Arch.i386 => @import("i386.zig"), - builtin.Arch.aarch64 => @import("arm64.zig"), + builtin.Arch.x86_64 => @import("linux/x86_64.zig"), + builtin.Arch.i386 => @import("linux/i386.zig"), + builtin.Arch.aarch64 => @import("linux/arm64.zig"), else => @compileError("unsupported arch"), }; -pub use @import("errno.zig"); +pub use @import("linux/errno.zig"); pub const PATH_MAX = 4096; @@ -1536,6 +1536,6 @@ pub const dirent64 = extern struct { test "import" { if (builtin.os == builtin.Os.linux) { - _ = @import("test.zig"); + _ = @import("linux/test.zig"); } } diff --git a/std/os/linux/arm64.zig b/std/os/linux/arm64.zig index 91e4a496796522c5d878d761d5649fcedd6548aa..ac2c18ee5f2abf19081940c47b4d6252b45ce952 100644 --- a/std/os/linux/arm64.zig +++ b/std/os/linux/arm64.zig @@ -1,4 +1,4 @@ -const std = @import("../../index.zig"); +const std = @import("../../std.zig"); const linux = std.os.linux; const socklen_t = linux.socklen_t; const iovec = linux.iovec; diff --git a/std/os/linux/test.zig b/std/os/linux/test.zig index 40fb7823d2c9f00ff29f83c7738464579a91f152..286748b70c3b98fb21c52f1748dbf53b40ce5e52 100644 --- a/std/os/linux/test.zig +++ b/std/os/linux/test.zig @@ -1,4 +1,4 @@ -const std = @import("../../index.zig"); +const std = @import("../../std.zig"); const builtin = @import("builtin"); const linux = std.os.linux; const expect = std.testing.expect; diff --git a/std/os/linux/vdso.zig b/std/os/linux/vdso.zig index 07745ad1ebc2c42cef872a3b00ef9b4533a75938..efd69d8542478809e8a4a456fe48f9e1cd6e06f2 100644 --- a/std/os/linux/vdso.zig +++ b/std/os/linux/vdso.zig @@ -1,4 +1,4 @@ -const std = @import("../../index.zig"); +const std = @import("../../std.zig"); const elf = std.elf; const linux = std.os.linux; const cstr = std.cstr; diff --git a/std/os/linux/x86_64.zig b/std/os/linux/x86_64.zig index 2ea369d9f289554ad94918dd30f0434b45e8d0d8..d194cd4003cf760c49bb67784448d8782634e54f 100644 --- a/std/os/linux/x86_64.zig +++ b/std/os/linux/x86_64.zig @@ -1,4 +1,4 @@ -const std = @import("../../index.zig"); +const std = @import("../../std.zig"); const linux = std.os.linux; const socklen_t = linux.socklen_t; const iovec = linux.iovec; diff --git a/std/os/netbsd/index.zig b/std/os/netbsd.zig similarity index 99% rename from std/os/netbsd/index.zig rename to std/os/netbsd.zig index ebabc3c801eaa340d67471dc914e890928205800..2d4b6ff1246d26b811d65a67a400addb430626a8 100644 --- a/std/os/netbsd/index.zig +++ b/std/os/netbsd.zig @@ -1,8 +1,8 @@ const builtin = @import("builtin"); -pub use @import("errno.zig"); +pub use @import("netbsd/errno.zig"); -const std = @import("../../index.zig"); +const std = @import("../std.zig"); const c = std.c; const assert = std.debug.assert; @@ -110,7 +110,6 @@ pub const X_OK = 1; // test for execute or search permission pub const W_OK = 2; // test for write permission pub const R_OK = 4; // test for read permission - pub const O_RDONLY = 0x0000; pub const O_WRONLY = 0x0001; pub const O_RDWR = 0x0002; diff --git a/std/os/path.zig b/std/os/path.zig index 290f8ba17ff2a0681ae725bc637412c622d84fd2..b68ff32408ccd68fcc43e8228558fb3288146553 100644 --- a/std/os/path.zig +++ b/std/os/path.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const builtin = @import("builtin"); const Os = builtin.Os; const debug = std.debug; diff --git a/std/os/test.zig b/std/os/test.zig index b2a4d966518477291333ae4ecd422f5fbbacd892..ab21ea1568b0f2d90f1d9e4a93d3eb7ce04876c7 100644 --- a/std/os/test.zig +++ b/std/os/test.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const os = std.os; const expect = std.testing.expect; const io = std.io; diff --git a/std/os/time.zig b/std/os/time.zig index bce6f265defe5dedf9d7776657e8a5c65e87c47c..66ceedb1b614ec628f8814f1195c20b15c1084a3 100644 --- a/std/os/time.zig +++ b/std/os/time.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const builtin = @import("builtin"); const Os = builtin.Os; const debug = std.debug; diff --git a/std/os/windows/index.zig b/std/os/windows.zig similarity index 96% rename from std/os/windows/index.zig rename to std/os/windows.zig index 8e9ed8b8dbfabc6dbc555e5ff8779440d9002a72..96274632ce1c927c07fe5863098038dce96fc2ba 100644 --- a/std/os/windows/index.zig +++ b/std/os/windows.zig @@ -1,18 +1,18 @@ -const std = @import("../../index.zig"); +const std = @import("../std.zig"); const assert = std.debug.assert; const maxInt = std.math.maxInt; -pub use @import("advapi32.zig"); -pub use @import("kernel32.zig"); -pub use @import("ntdll.zig"); -pub use @import("ole32.zig"); -pub use @import("shell32.zig"); +pub use @import("windows/advapi32.zig"); +pub use @import("windows/kernel32.zig"); +pub use @import("windows/ntdll.zig"); +pub use @import("windows/ole32.zig"); +pub use @import("windows/shell32.zig"); test "import" { - _ = @import("util.zig"); + _ = @import("windows/util.zig"); } -pub const ERROR = @import("error.zig"); +pub const ERROR = @import("windows/error.zig"); pub const SHORT = c_short; pub const BOOL = c_int; @@ -396,4 +396,4 @@ pub const IMAGE_TLS_DIRECTORY = extern struct { pub const IMAGE_TLS_DIRECTORY64 = IMAGE_TLS_DIRECTORY; pub const IMAGE_TLS_DIRECTORY32 = IMAGE_TLS_DIRECTORY; -pub const PIMAGE_TLS_CALLBACK = ?extern fn(PVOID, DWORD, PVOID) void; +pub const PIMAGE_TLS_CALLBACK = ?extern fn (PVOID, DWORD, PVOID) void; diff --git a/std/os/windows/advapi32.zig b/std/os/windows/advapi32.zig index 185c1424c6fae99b3ff0140f9c36e7083e3f391b..9672767500a11ceb7e06f3928cbd3e5d34e6f0a9 100644 --- a/std/os/windows/advapi32.zig +++ b/std/os/windows/advapi32.zig @@ -1,4 +1,4 @@ -use @import("index.zig"); +use @import("../windows.zig"); pub const PROV_RSA_FULL = 1; diff --git a/std/os/windows/kernel32.zig b/std/os/windows/kernel32.zig index ce8443de02c3ed5a773b898f9e0cdca51650b8cb..64a97ca87d0216f4e6c3e149bc77d28b7251e7dd 100644 --- a/std/os/windows/kernel32.zig +++ b/std/os/windows/kernel32.zig @@ -1,4 +1,4 @@ -use @import("index.zig"); +use @import("../windows.zig"); pub extern "kernel32" stdcallcc fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVERLAPPED) BOOL; @@ -262,12 +262,10 @@ pub const INIT_ONCE_STATIC_INIT = RTL_RUN_ONCE_INIT; pub extern "kernel32" stdcallcc fn InitOnceExecuteOnce(InitOnce: *INIT_ONCE, InitFn: INIT_ONCE_FN, Parameter: ?*c_void, Context: ?*c_void) BOOL; -pub const INIT_ONCE_FN = extern fn(InitOnce: *INIT_ONCE, Parameter: ?*c_void, Context: ?*c_void) BOOL; +pub const INIT_ONCE_FN = extern fn (InitOnce: *INIT_ONCE, Parameter: ?*c_void, Context: ?*c_void) BOOL; pub const RTL_RUN_ONCE = extern struct { Ptr: ?*c_void, }; -pub const RTL_RUN_ONCE_INIT = RTL_RUN_ONCE { - .Ptr = null, -}; +pub const RTL_RUN_ONCE_INIT = RTL_RUN_ONCE{ .Ptr = null }; diff --git a/std/os/windows/ntdll.zig b/std/os/windows/ntdll.zig index acb78a59f4d7115457ddc835d582ea7bca245f2a..1b63c1e7ec4c67de26bc03884beea7c2db4c531c 100644 --- a/std/os/windows/ntdll.zig +++ b/std/os/windows/ntdll.zig @@ -1,3 +1,3 @@ -use @import("index.zig"); +use @import("../windows.zig"); pub extern "NtDll" stdcallcc fn RtlCaptureStackBackTrace(FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: **c_void, BackTraceHash: ?*DWORD) WORD; diff --git a/std/os/windows/ole32.zig b/std/os/windows/ole32.zig index 8f34b45bbf3acad676b378e084bd852994c7ac72..1ecfecba3c69b3e3d36719b3f44069b386325031 100644 --- a/std/os/windows/ole32.zig +++ b/std/os/windows/ole32.zig @@ -1,4 +1,4 @@ -use @import("index.zig"); +use @import("../windows.zig"); pub extern "ole32" stdcallcc fn CoTaskMemFree(pv: LPVOID) void; pub extern "ole32" stdcallcc fn CoUninitialize() void; diff --git a/std/os/windows/shell32.zig b/std/os/windows/shell32.zig index 139babc7a8eba05a1392cc529e1a834cd13219a2..c299e01f17c0fd2bc2971e0c9ee86194ea24346d 100644 --- a/std/os/windows/shell32.zig +++ b/std/os/windows/shell32.zig @@ -1,4 +1,4 @@ -use @import("index.zig"); +use @import("../windows.zig"); pub extern "shell32" stdcallcc fn SHGetKnownFolderPath(rfid: *const KNOWNFOLDERID, dwFlags: DWORD, hToken: ?HANDLE, ppszPath: *[*]WCHAR) HRESULT; diff --git a/std/os/windows/util.zig b/std/os/windows/util.zig index 849c15a6f59f97effa9fad11fc6358181d238501..09523430516c453334f6ba7fbfd6326f782581c7 100644 --- a/std/os/windows/util.zig +++ b/std/os/windows/util.zig @@ -1,4 +1,4 @@ -const std = @import("../../index.zig"); +const std = @import("../../std.zig"); const builtin = @import("builtin"); const os = std.os; const unicode = std.unicode; diff --git a/std/os/zen.zig b/std/os/zen.zig index 76c4df9d62a32cf009ed3f96fa634ee7c7dcdff2..0564956b2451dd8bd7ac460e4e036cd066c620c0 100644 --- a/std/os/zen.zig +++ b/std/os/zen.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const assert = std.debug.assert; ////////////////////////// diff --git a/std/pdb.zig b/std/pdb.zig index 663f81e0c26c142853b0979fcf27d35aaa287c73..2b02a8487105232179381fa3d61806b80c35b7af 100644 --- a/std/pdb.zig +++ b/std/pdb.zig @@ -1,5 +1,5 @@ const builtin = @import("builtin"); -const std = @import("index.zig"); +const std = @import("std.zig"); const io = std.io; const math = std.math; const mem = std.mem; diff --git a/std/priority_queue.zig b/std/priority_queue.zig index 33b5a963c66c6638e7a42ef12ded36340a115efe..d2c493af3e8c5c74b9ff1a7ff7b2c8ebbe618071 100644 --- a/std/priority_queue.zig +++ b/std/priority_queue.zig @@ -1,4 +1,4 @@ -const std = @import("index.zig"); +const std = @import("std.zig"); const Allocator = std.mem.Allocator; const debug = std.debug; const expect = std.testing.expect; diff --git a/std/rand/index.zig b/std/rand.zig similarity index 99% rename from std/rand/index.zig rename to std/rand.zig index 12dd763aeecf85883071c2e2721afb2a9481be16..a2fdfed6fd5787127d3c1dbb57d77d5bd5acc1e2 100644 --- a/std/rand/index.zig +++ b/std/rand.zig @@ -14,13 +14,13 @@ // // TODO(tiehuis): Benchmark these against other reference implementations. -const std = @import("../index.zig"); +const std = @import("std.zig"); const builtin = @import("builtin"); const assert = std.debug.assert; const expect = std.testing.expect; const mem = std.mem; const math = std.math; -const ziggurat = @import("ziggurat.zig"); +const ziggurat = @import("rand/ziggurat.zig"); const maxInt = std.math.maxInt; // When you need fast unbiased random numbers diff --git a/std/rand/ziggurat.zig b/std/rand/ziggurat.zig index 0636a5bfc42c3d286f66ea823ff01ecdb152b0f0..995248415be1c35fc8cd60f2e431286eb820199e 100644 --- a/std/rand/ziggurat.zig +++ b/std/rand/ziggurat.zig @@ -8,7 +8,7 @@ // NOTE: This seems interesting but reference code is a bit hard to grok: // https://sbarral.github.io/etf. -const std = @import("../index.zig"); +const std = @import("../std.zig"); const math = std.math; const Random = std.rand.Random; diff --git a/std/rb.zig b/std/rb.zig index 27e60dca6ab02dba5a4f44902ed1dc2837690a6a..0b28550a131927573bbc5f89550727a3789ecbb6 100644 --- a/std/rb.zig +++ b/std/rb.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; // For mem.Compare diff --git a/std/segmented_list.zig b/std/segmented_list.zig index 26b7fa48f59909e5b67073f1be48b94f8f1c73a2..0600fbba3fd8c4b321e714f93df4b7346f3ed86f 100644 --- a/std/segmented_list.zig +++ b/std/segmented_list.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 Allocator = std.mem.Allocator; diff --git a/std/sort.zig b/std/sort.zig index 86a6724fee6113aae6849bd01acf65105b726b1b..69dc148f31bcb317ee83051864181890406d55cf 100644 --- a/std/sort.zig +++ b/std/sort.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; diff --git a/std/special/compiler_rt/index.zig b/std/special/compiler_rt.zig similarity index 79% rename from std/special/compiler_rt/index.zig rename to std/special/compiler_rt.zig index 7657ce61186ac5fdbf7437f0142d1b50bdc711cc..e8a45949e42fe86db5b78d021dffdac80c94bc32 100644 --- a/std/special/compiler_rt/index.zig +++ b/std/special/compiler_rt.zig @@ -5,68 +5,68 @@ comptime { const linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Weak; const strong_linkage = if (is_test) builtin.GlobalLinkage.Internal else builtin.GlobalLinkage.Strong; - @export("__letf2", @import("comparetf2.zig").__letf2, linkage); - @export("__getf2", @import("comparetf2.zig").__getf2, linkage); + @export("__letf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage); + @export("__getf2", @import("compiler_rt/comparetf2.zig").__getf2, linkage); if (!is_test) { // only create these aliases when not testing - @export("__cmptf2", @import("comparetf2.zig").__letf2, linkage); - @export("__eqtf2", @import("comparetf2.zig").__letf2, linkage); - @export("__lttf2", @import("comparetf2.zig").__letf2, linkage); - @export("__netf2", @import("comparetf2.zig").__letf2, linkage); - @export("__gttf2", @import("comparetf2.zig").__getf2, linkage); - @export("__gnu_h2f_ieee", @import("extendXfYf2.zig").__extendhfsf2, linkage); - @export("__gnu_f2h_ieee", @import("truncXfYf2.zig").__truncsfhf2, linkage); + @export("__cmptf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage); + @export("__eqtf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage); + @export("__lttf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage); + @export("__netf2", @import("compiler_rt/comparetf2.zig").__letf2, linkage); + @export("__gttf2", @import("compiler_rt/comparetf2.zig").__getf2, linkage); + @export("__gnu_h2f_ieee", @import("compiler_rt/extendXfYf2.zig").__extendhfsf2, linkage); + @export("__gnu_f2h_ieee", @import("compiler_rt/truncXfYf2.zig").__truncsfhf2, linkage); } - @export("__unordtf2", @import("comparetf2.zig").__unordtf2, linkage); - - @export("__addtf3", @import("addXf3.zig").__addtf3, linkage); - @export("__subtf3", @import("addXf3.zig").__subtf3, linkage); - - @export("__floattitf", @import("floattitf.zig").__floattitf, linkage); - @export("__floattidf", @import("floattidf.zig").__floattidf, linkage); - @export("__floattisf", @import("floattisf.zig").__floattisf, linkage); - - @export("__floatunditf", @import("floatunditf.zig").__floatunditf, linkage); - @export("__floatunsitf", @import("floatunsitf.zig").__floatunsitf, linkage); - - @export("__floatuntitf", @import("floatuntitf.zig").__floatuntitf, linkage); - @export("__floatuntidf", @import("floatuntidf.zig").__floatuntidf, linkage); - @export("__floatuntisf", @import("floatuntisf.zig").__floatuntisf, linkage); - - @export("__extenddftf2", @import("extendXfYf2.zig").__extenddftf2, linkage); - @export("__extendsftf2", @import("extendXfYf2.zig").__extendsftf2, linkage); - @export("__extendhfsf2", @import("extendXfYf2.zig").__extendhfsf2, linkage); - - @export("__truncsfhf2", @import("truncXfYf2.zig").__truncsfhf2, linkage); - @export("__truncdfhf2", @import("truncXfYf2.zig").__truncdfhf2, linkage); - @export("__trunctfdf2", @import("truncXfYf2.zig").__trunctfdf2, linkage); - @export("__trunctfsf2", @import("truncXfYf2.zig").__trunctfsf2, linkage); - - @export("__fixunssfsi", @import("fixunssfsi.zig").__fixunssfsi, linkage); - @export("__fixunssfdi", @import("fixunssfdi.zig").__fixunssfdi, linkage); - @export("__fixunssfti", @import("fixunssfti.zig").__fixunssfti, linkage); - - @export("__fixunsdfsi", @import("fixunsdfsi.zig").__fixunsdfsi, linkage); - @export("__fixunsdfdi", @import("fixunsdfdi.zig").__fixunsdfdi, linkage); - @export("__fixunsdfti", @import("fixunsdfti.zig").__fixunsdfti, linkage); - - @export("__fixunstfsi", @import("fixunstfsi.zig").__fixunstfsi, linkage); - @export("__fixunstfdi", @import("fixunstfdi.zig").__fixunstfdi, linkage); - @export("__fixunstfti", @import("fixunstfti.zig").__fixunstfti, linkage); - - @export("__fixdfdi", @import("fixdfdi.zig").__fixdfdi, linkage); - @export("__fixdfsi", @import("fixdfsi.zig").__fixdfsi, linkage); - @export("__fixdfti", @import("fixdfti.zig").__fixdfti, linkage); - @export("__fixsfdi", @import("fixsfdi.zig").__fixsfdi, linkage); - @export("__fixsfsi", @import("fixsfsi.zig").__fixsfsi, linkage); - @export("__fixsfti", @import("fixsfti.zig").__fixsfti, linkage); - @export("__fixtfdi", @import("fixtfdi.zig").__fixtfdi, linkage); - @export("__fixtfsi", @import("fixtfsi.zig").__fixtfsi, linkage); - @export("__fixtfti", @import("fixtfti.zig").__fixtfti, linkage); - - @export("__udivmoddi4", @import("udivmoddi4.zig").__udivmoddi4, linkage); + @export("__unordtf2", @import("compiler_rt/comparetf2.zig").__unordtf2, linkage); + + @export("__addtf3", @import("compiler_rt/addXf3.zig").__addtf3, linkage); + @export("__subtf3", @import("compiler_rt/addXf3.zig").__subtf3, linkage); + + @export("__floattitf", @import("compiler_rt/floattitf.zig").__floattitf, linkage); + @export("__floattidf", @import("compiler_rt/floattidf.zig").__floattidf, linkage); + @export("__floattisf", @import("compiler_rt/floattisf.zig").__floattisf, linkage); + + @export("__floatunditf", @import("compiler_rt/floatunditf.zig").__floatunditf, linkage); + @export("__floatunsitf", @import("compiler_rt/floatunsitf.zig").__floatunsitf, linkage); + + @export("__floatuntitf", @import("compiler_rt/floatuntitf.zig").__floatuntitf, linkage); + @export("__floatuntidf", @import("compiler_rt/floatuntidf.zig").__floatuntidf, linkage); + @export("__floatuntisf", @import("compiler_rt/floatuntisf.zig").__floatuntisf, linkage); + + @export("__extenddftf2", @import("compiler_rt/extendXfYf2.zig").__extenddftf2, linkage); + @export("__extendsftf2", @import("compiler_rt/extendXfYf2.zig").__extendsftf2, linkage); + @export("__extendhfsf2", @import("compiler_rt/extendXfYf2.zig").__extendhfsf2, linkage); + + @export("__truncsfhf2", @import("compiler_rt/truncXfYf2.zig").__truncsfhf2, linkage); + @export("__truncdfhf2", @import("compiler_rt/truncXfYf2.zig").__truncdfhf2, linkage); + @export("__trunctfdf2", @import("compiler_rt/truncXfYf2.zig").__trunctfdf2, linkage); + @export("__trunctfsf2", @import("compiler_rt/truncXfYf2.zig").__trunctfsf2, linkage); + + @export("__fixunssfsi", @import("compiler_rt/fixunssfsi.zig").__fixunssfsi, linkage); + @export("__fixunssfdi", @import("compiler_rt/fixunssfdi.zig").__fixunssfdi, linkage); + @export("__fixunssfti", @import("compiler_rt/fixunssfti.zig").__fixunssfti, linkage); + + @export("__fixunsdfsi", @import("compiler_rt/fixunsdfsi.zig").__fixunsdfsi, linkage); + @export("__fixunsdfdi", @import("compiler_rt/fixunsdfdi.zig").__fixunsdfdi, linkage); + @export("__fixunsdfti", @import("compiler_rt/fixunsdfti.zig").__fixunsdfti, linkage); + + @export("__fixunstfsi", @import("compiler_rt/fixunstfsi.zig").__fixunstfsi, linkage); + @export("__fixunstfdi", @import("compiler_rt/fixunstfdi.zig").__fixunstfdi, linkage); + @export("__fixunstfti", @import("compiler_rt/fixunstfti.zig").__fixunstfti, linkage); + + @export("__fixdfdi", @import("compiler_rt/fixdfdi.zig").__fixdfdi, linkage); + @export("__fixdfsi", @import("compiler_rt/fixdfsi.zig").__fixdfsi, linkage); + @export("__fixdfti", @import("compiler_rt/fixdfti.zig").__fixdfti, linkage); + @export("__fixsfdi", @import("compiler_rt/fixsfdi.zig").__fixsfdi, linkage); + @export("__fixsfsi", @import("compiler_rt/fixsfsi.zig").__fixsfsi, linkage); + @export("__fixsfti", @import("compiler_rt/fixsfti.zig").__fixsfti, linkage); + @export("__fixtfdi", @import("compiler_rt/fixtfdi.zig").__fixtfdi, linkage); + @export("__fixtfsi", @import("compiler_rt/fixtfsi.zig").__fixtfsi, linkage); + @export("__fixtfti", @import("compiler_rt/fixtfti.zig").__fixtfti, linkage); + + @export("__udivmoddi4", @import("compiler_rt/udivmoddi4.zig").__udivmoddi4, linkage); @export("__udivsi3", __udivsi3, linkage); @export("__udivdi3", __udivdi3, linkage); @@ -85,30 +85,30 @@ comptime { @export("_chkstk", _chkstk, strong_linkage); @export("__chkstk_ms", __chkstk_ms, linkage); } - @export("_aulldiv", @import("aulldiv.zig")._aulldiv, strong_linkage); - @export("_aullrem", @import("aullrem.zig")._aullrem, strong_linkage); + @export("_aulldiv", @import("compiler_rt/aulldiv.zig")._aulldiv, strong_linkage); + @export("_aullrem", @import("compiler_rt/aullrem.zig")._aullrem, strong_linkage); }, builtin.Arch.x86_64 => { if (!builtin.link_libc) { @export("__chkstk", __chkstk, strong_linkage); @export("___chkstk_ms", ___chkstk_ms, linkage); } - @export("__divti3", @import("divti3.zig").__divti3_windows_x86_64, linkage); - @export("__multi3", @import("multi3.zig").__multi3_windows_x86_64, linkage); - @export("__muloti4", @import("muloti4.zig").__muloti4_windows_x86_64, linkage); - @export("__udivti3", @import("udivti3.zig").__udivti3_windows_x86_64, linkage); - @export("__udivmodti4", @import("udivmodti4.zig").__udivmodti4_windows_x86_64, linkage); - @export("__umodti3", @import("umodti3.zig").__umodti3_windows_x86_64, linkage); + @export("__divti3", @import("compiler_rt/divti3.zig").__divti3_windows_x86_64, linkage); + @export("__multi3", @import("compiler_rt/multi3.zig").__multi3_windows_x86_64, linkage); + @export("__muloti4", @import("compiler_rt/muloti4.zig").__muloti4_windows_x86_64, linkage); + @export("__udivti3", @import("compiler_rt/udivti3.zig").__udivti3_windows_x86_64, linkage); + @export("__udivmodti4", @import("compiler_rt/udivmodti4.zig").__udivmodti4_windows_x86_64, linkage); + @export("__umodti3", @import("compiler_rt/umodti3.zig").__umodti3_windows_x86_64, linkage); }, else => {}, } } else { - @export("__divti3", @import("divti3.zig").__divti3, linkage); - @export("__multi3", @import("multi3.zig").__multi3, linkage); - @export("__muloti4", @import("muloti4.zig").__muloti4, linkage); - @export("__udivti3", @import("udivti3.zig").__udivti3, linkage); - @export("__udivmodti4", @import("udivmodti4.zig").__udivmodti4, linkage); - @export("__umodti3", @import("umodti3.zig").__umodti3, linkage); + @export("__divti3", @import("compiler_rt/divti3.zig").__divti3, linkage); + @export("__multi3", @import("compiler_rt/multi3.zig").__multi3, linkage); + @export("__muloti4", @import("compiler_rt/muloti4.zig").__muloti4, linkage); + @export("__udivti3", @import("compiler_rt/udivti3.zig").__udivti3, linkage); + @export("__udivmodti4", @import("compiler_rt/udivmodti4.zig").__udivmodti4, linkage); + @export("__umodti3", @import("compiler_rt/umodti3.zig").__umodti3, linkage); } } @@ -116,7 +116,7 @@ const std = @import("std"); const assert = std.debug.assert; const testing = std.testing; -const __udivmoddi4 = @import("udivmoddi4.zig").__udivmoddi4; +const __udivmoddi4 = @import("compiler_rt/udivmoddi4.zig").__udivmoddi4; // Avoid dragging in the runtime safety mechanisms into this .o file, // unless we're trying to test this file. diff --git a/std/special/compiler_rt/addXf3.zig b/std/special/compiler_rt/addXf3.zig index 09413b23287cf4e16e6fc37c977a62636e7c67f7..c7e80e4e713a6eac3496ea0104bb6869a974e948 100644 --- a/std/special/compiler_rt/addXf3.zig +++ b/std/special/compiler_rt/addXf3.zig @@ -4,7 +4,7 @@ const std = @import("std"); const builtin = @import("builtin"); -const compiler_rt = @import("index.zig"); +const compiler_rt = @import("../compiler_rt.zig"); pub extern fn __addtf3(a: f128, b: f128) f128 { return addXf3(f128, a, b); diff --git a/std/special/compiler_rt/divti3.zig b/std/special/compiler_rt/divti3.zig index 712cccba8234649bc2b76471bf0d990ce8b7eaf3..e89a1ada5c82e6b566ae5f67f078a06c0d27f77c 100644 --- a/std/special/compiler_rt/divti3.zig +++ b/std/special/compiler_rt/divti3.zig @@ -1,6 +1,6 @@ const udivmod = @import("udivmod.zig").udivmod; const builtin = @import("builtin"); -const compiler_rt = @import("index.zig"); +const compiler_rt = @import("../compiler_rt.zig"); pub extern fn __divti3(a: i128, b: i128) i128 { @setRuntimeSafety(builtin.is_test); diff --git a/std/special/compiler_rt/muloti4.zig b/std/special/compiler_rt/muloti4.zig index 866077c80c3ccebbf351b7ff256462d2e04241fa..fd6855072b11c67e66c9cd0fd3fead725de29f53 100644 --- a/std/special/compiler_rt/muloti4.zig +++ b/std/special/compiler_rt/muloti4.zig @@ -1,6 +1,6 @@ const udivmod = @import("udivmod.zig").udivmod; const builtin = @import("builtin"); -const compiler_rt = @import("index.zig"); +const compiler_rt = @import("../compiler_rt.zig"); pub extern fn __muloti4(a: i128, b: i128, overflow: *c_int) i128 { @setRuntimeSafety(builtin.is_test); diff --git a/std/special/compiler_rt/multi3.zig b/std/special/compiler_rt/multi3.zig index 1152a8bda010e536c467a1454a67f52e18efdb39..a0c84adaf4197ef88b7e56d674d020ea79c90085 100644 --- a/std/special/compiler_rt/multi3.zig +++ b/std/special/compiler_rt/multi3.zig @@ -1,5 +1,5 @@ const builtin = @import("builtin"); -const compiler_rt = @import("index.zig"); +const compiler_rt = @import("../compiler_rt.zig"); // Ported from git@github.com:llvm-project/llvm-project-20170507.git // ae684fad6d34858c014c94da69c15e7774a633c3 diff --git a/std/special/compiler_rt/udivmodti4.zig b/std/special/compiler_rt/udivmodti4.zig index 3fa596442f2793e01533059d3e2d70568c150596..6a037d3bae7751f0ca173bafa3704f7a86d4f3fb 100644 --- a/std/special/compiler_rt/udivmodti4.zig +++ b/std/special/compiler_rt/udivmodti4.zig @@ -1,6 +1,6 @@ const udivmod = @import("udivmod.zig").udivmod; const builtin = @import("builtin"); -const compiler_rt = @import("index.zig"); +const compiler_rt = @import("../compiler_rt.zig"); pub extern fn __udivmodti4(a: u128, b: u128, maybe_rem: ?*u128) u128 { @setRuntimeSafety(builtin.is_test); diff --git a/std/special/compiler_rt/umodti3.zig b/std/special/compiler_rt/umodti3.zig index 9551e63a6f8e6a3bea085582759aab4290dc6fd6..12aca8b03623e5793ce6f736640dc9d49aa0a506 100644 --- a/std/special/compiler_rt/umodti3.zig +++ b/std/special/compiler_rt/umodti3.zig @@ -1,6 +1,6 @@ const udivmodti4 = @import("udivmodti4.zig"); const builtin = @import("builtin"); -const compiler_rt = @import("index.zig"); +const compiler_rt = @import("../compiler_rt.zig"); pub extern fn __umodti3(a: u128, b: u128) u128 { @setRuntimeSafety(builtin.is_test); diff --git a/std/spinlock.zig b/std/spinlock.zig index 75fdf9f6e1f67399607d62bd9bb4b2d316e78f4a..905460a2d0c6ec21e775d2256cb21276b0e218f9 100644 --- a/std/spinlock.zig +++ b/std/spinlock.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; diff --git a/std/statically_initialized_mutex.zig b/std/statically_initialized_mutex.zig index 16bcd7adafe49dffdd1c26c0c30a5c7b4ec6b67f..cfcaf036d392b2d891ea00b269b7019fb3d88284 100644 --- a/std/statically_initialized_mutex.zig +++ b/std/statically_initialized_mutex.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; @@ -13,7 +13,7 @@ const windows = std.os.windows; /// On Windows, this mutex allocates resources when it is /// first used, and the resources cannot be freed. /// On Linux, this is an alias of std.Mutex. -pub const StaticallyInitializedMutex = switch(builtin.os) { +pub const StaticallyInitializedMutex = switch (builtin.os) { builtin.Os.linux => std.Mutex, builtin.Os.windows => struct { lock: windows.CRITICAL_SECTION, @@ -28,7 +28,7 @@ pub const StaticallyInitializedMutex = switch(builtin.os) { }; pub fn init() StaticallyInitializedMutex { - return StaticallyInitializedMutex { + return StaticallyInitializedMutex{ .lock = undefined, .init_once = windows.INIT_ONCE_STATIC_INIT, }; @@ -54,7 +54,7 @@ pub const StaticallyInitializedMutex = switch(builtin.os) { pub fn acquire(self: *StaticallyInitializedMutex) Held { assert(windows.InitOnceExecuteOnce(&self.init_once, initCriticalSection, &self.lock, null) != 0); windows.EnterCriticalSection(&self.lock); - return Held { .mutex = self }; + return Held{ .mutex = self }; } }, else => std.Mutex, @@ -89,10 +89,7 @@ test "std.StaticallyInitializedMutex" { var fixed_buffer_allocator = std.heap.ThreadSafeFixedBufferAllocator.init(plenty_of_memory); var a = &fixed_buffer_allocator.allocator; - - var context = TestContext{ - .data = 0, - }; + var context = TestContext{ .data = 0 }; if (builtin.single_threaded) { TestContext.worker(&context); diff --git a/std/index.zig b/std/std.zig similarity index 76% rename from std/index.zig rename to std/std.zig index f8c1b065e9bd57dadc99e5efb192122c2a402a01..4a81fc7c3569d74eb2a36f0206b656571308a800 100644 --- a/std/index.zig +++ b/std/std.zig @@ -14,43 +14,43 @@ pub const StaticallyInitializedMutex = @import("statically_initialized_mutex.zig pub const SegmentedList = @import("segmented_list.zig").SegmentedList; pub const SpinLock = @import("spinlock.zig").SpinLock; -pub const atomic = @import("atomic/index.zig"); +pub const atomic = @import("atomic.zig"); pub const base64 = @import("base64.zig"); pub const build = @import("build.zig"); -pub const c = @import("c/index.zig"); +pub const c = @import("c.zig"); pub const coff = @import("coff.zig"); -pub const crypto = @import("crypto/index.zig"); +pub const crypto = @import("crypto.zig"); pub const cstr = @import("cstr.zig"); -pub const debug = @import("debug/index.zig"); +pub const debug = @import("debug.zig"); pub const dwarf = @import("dwarf.zig"); pub const elf = @import("elf.zig"); pub const empty_import = @import("empty.zig"); pub const event = @import("event.zig"); -pub const fmt = @import("fmt/index.zig"); -pub const hash = @import("hash/index.zig"); +pub const fmt = @import("fmt.zig"); +pub const hash = @import("hash.zig"); pub const hash_map = @import("hash_map.zig"); pub const heap = @import("heap.zig"); pub const io = @import("io.zig"); pub const json = @import("json.zig"); pub const lazyInit = @import("lazy_init.zig").lazyInit; pub const macho = @import("macho.zig"); -pub const math = @import("math/index.zig"); +pub const math = @import("math.zig"); pub const mem = @import("mem.zig"); -pub const meta = @import("meta/index.zig"); +pub const meta = @import("meta.zig"); pub const net = @import("net.zig"); -pub const os = @import("os/index.zig"); +pub const os = @import("os.zig"); pub const pdb = @import("pdb.zig"); -pub const rand = @import("rand/index.zig"); +pub const rand = @import("rand.zig"); pub const rb = @import("rb.zig"); pub const sort = @import("sort.zig"); pub const testing = @import("testing.zig"); pub const unicode = @import("unicode.zig"); -pub const zig = @import("zig/index.zig"); +pub const zig = @import("zig.zig"); test "std" { // run tests from these _ = @import("array_list.zig"); - _ = @import("atomic/index.zig"); + _ = @import("atomic.zig"); _ = @import("buf_map.zig"); _ = @import("buf_set.zig"); _ = @import("buffer.zig"); @@ -63,33 +63,33 @@ test "std" { _ = @import("base64.zig"); _ = @import("build.zig"); - _ = @import("c/index.zig"); + _ = @import("c.zig"); _ = @import("coff.zig"); - _ = @import("crypto/index.zig"); + _ = @import("crypto.zig"); _ = @import("cstr.zig"); - _ = @import("debug/index.zig"); + _ = @import("debug.zig"); _ = @import("dwarf.zig"); _ = @import("dynamic_library.zig"); _ = @import("elf.zig"); _ = @import("empty.zig"); _ = @import("event.zig"); - _ = @import("fmt/index.zig"); - _ = @import("hash/index.zig"); + _ = @import("fmt.zig"); + _ = @import("hash.zig"); _ = @import("heap.zig"); _ = @import("io.zig"); _ = @import("json.zig"); _ = @import("lazy_init.zig"); _ = @import("macho.zig"); - _ = @import("math/index.zig"); + _ = @import("math.zig"); _ = @import("mem.zig"); - _ = @import("meta/index.zig"); + _ = @import("meta.zig"); _ = @import("net.zig"); - _ = @import("os/index.zig"); + _ = @import("os.zig"); _ = @import("pdb.zig"); _ = @import("priority_queue.zig"); - _ = @import("rand/index.zig"); + _ = @import("rand.zig"); _ = @import("sort.zig"); _ = @import("testing.zig"); _ = @import("unicode.zig"); - _ = @import("zig/index.zig"); + _ = @import("zig.zig"); } diff --git a/std/testing.zig b/std/testing.zig index 359a7879604d2c112085042b3b18e89f18f97f80..be414181f20c9e72f13dbbd151b3999525d44a5b 100644 --- a/std/testing.zig +++ b/std/testing.zig @@ -1,6 +1,6 @@ const builtin = @import("builtin"); const TypeId = builtin.TypeId; -const std = @import("index.zig"); +const std = @import("std.zig"); /// This function is intended to be used only in tests. It prints diagnostics to stderr /// and then aborts when actual_error_union is not expected_error. diff --git a/std/unicode.zig b/std/unicode.zig index fccdf513b90527565b38a5f77e0132be6dd8a0fa..37a73d75004bd943a19fa8aaa7153308b185d3a0 100644 --- a/std/unicode.zig +++ b/std/unicode.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; diff --git a/std/zig.zig b/std/zig.zig new file mode 100644 index 0000000000000000000000000000000000000000..2d4978a4aec8e3254b17a182c0ce16b43164563b --- /dev/null +++ b/std/zig.zig @@ -0,0 +1,16 @@ +const tokenizer = @import("zig/tokenizer.zig"); +pub const Token = tokenizer.Token; +pub const Tokenizer = tokenizer.Tokenizer; +pub const parse = @import("zig/parse.zig").parse; +pub const parseStringLiteral = @import("zig/parse_string_literal.zig").parseStringLiteral; +pub const render = @import("zig/render.zig").render; +pub const ast = @import("zig/ast.zig"); + +test "std.zig tests" { + _ = @import("zig/ast.zig"); + _ = @import("zig/parse.zig"); + _ = @import("zig/render.zig"); + _ = @import("zig/tokenizer.zig"); + _ = @import("zig/parse_string_literal.zig"); +} + diff --git a/std/zig/ast.zig b/std/zig/ast.zig index d33e30801b5515d5251919b93940f76330399a73..421c657619a3ca5a3be0c2fe9fe5b21d8a45e980 100644 --- a/std/zig/ast.zig +++ b/std/zig/ast.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 SegmentedList = std.SegmentedList; diff --git a/std/zig/bench.zig b/std/zig/bench.zig index 6a9e8495bda00028c4d0135fd8ae62529097a786..ed6ae9a128b37a72c410b20460f1f8cd724a839e 100644 --- a/std/zig/bench.zig +++ b/std/zig/bench.zig @@ -5,7 +5,7 @@ const Tokenizer = std.zig.Tokenizer; const Parser = std.zig.Parser; const io = std.io; -const source = @embedFile("../os/index.zig"); +const source = @embedFile("../os.zig"); var fixed_buffer_mem: [10 * 1024 * 1024]u8 = undefined; pub fn main() !void { diff --git a/std/zig/index.zig b/std/zig/index.zig deleted file mode 100644 index da84bc5bb0982db5d3acb608b5fac72250aa15fa..0000000000000000000000000000000000000000 --- a/std/zig/index.zig +++ /dev/null @@ -1,16 +0,0 @@ -const tokenizer = @import("tokenizer.zig"); -pub const Token = tokenizer.Token; -pub const Tokenizer = tokenizer.Tokenizer; -pub const parse = @import("parse.zig").parse; -pub const parseStringLiteral = @import("parse_string_literal.zig").parseStringLiteral; -pub const render = @import("render.zig").render; -pub const ast = @import("ast.zig"); - -test "std.zig tests" { - _ = @import("ast.zig"); - _ = @import("parse.zig"); - _ = @import("render.zig"); - _ = @import("tokenizer.zig"); - _ = @import("parse_string_literal.zig"); -} - diff --git a/std/zig/parse.zig b/std/zig/parse.zig index 867dd1159202b77e492085bb54b6eb1e238f0302..e957d1d3e1caa39d60117f8c7bde57217f0ef218 100644 --- a/std/zig/parse.zig +++ b/std/zig/parse.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const assert = std.debug.assert; const mem = std.mem; const ast = std.zig.ast; diff --git a/std/zig/parse_string_literal.zig b/std/zig/parse_string_literal.zig index 00c92a7651e0251f21fdf65a2f3ec28c73b9c2a0..acae0b64c79c1d5c4251b8ed75f6691862f628c6 100644 --- a/std/zig/parse_string_literal.zig +++ b/std/zig/parse_string_literal.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const assert = std.debug.assert; const State = enum { diff --git a/std/zig/render.zig b/std/zig/render.zig index 1abc845b7c3103c8457e6f32d7740b1ed3b13ed8..50e928c0d878d4f2df97cd49a522f67a8f0d9e96 100644 --- a/std/zig/render.zig +++ b/std/zig/render.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 mem = std.mem; diff --git a/std/zig/tokenizer.zig b/std/zig/tokenizer.zig index 877e4e8db377951f352e90a2c3e2a67aff91a053..79fd1c5612830332457daf9e875be5dbc56f7cd6 100644 --- a/std/zig/tokenizer.zig +++ b/std/zig/tokenizer.zig @@ -1,4 +1,4 @@ -const std = @import("../index.zig"); +const std = @import("../std.zig"); const mem = std.mem; pub const Token = struct { diff --git a/test/stage1/behavior.zig b/test/stage1/behavior.zig index c232003db79520758e69b479b8f5e6ec198f4ac4..9940a76af11c1801852bda86e43587ec59bd68f4 100644 --- a/test/stage1/behavior.zig +++ b/test/stage1/behavior.zig @@ -56,14 +56,14 @@ comptime { _ = @import("behavior/math.zig"); _ = @import("behavior/merge_error_sets.zig"); _ = @import("behavior/misc.zig"); - _ = @import("behavior/namespace_depends_on_compile_var/index.zig"); + _ = @import("behavior/namespace_depends_on_compile_var.zig"); _ = @import("behavior/new_stack_call.zig"); _ = @import("behavior/null.zig"); _ = @import("behavior/optional.zig"); _ = @import("behavior/pointers.zig"); _ = @import("behavior/popcount.zig"); _ = @import("behavior/ptrcast.zig"); - _ = @import("behavior/pub_enum/index.zig"); + _ = @import("behavior/pub_enum.zig"); _ = @import("behavior/ref_var_in_if_after_if_2nd_switch_prong.zig"); _ = @import("behavior/reflection.zig"); _ = @import("behavior/sizeof_and_typeof.zig"); diff --git a/test/stage1/behavior/namespace_depends_on_compile_var/index.zig b/test/stage1/behavior/namespace_depends_on_compile_var.zig similarity index 68% rename from test/stage1/behavior/namespace_depends_on_compile_var/index.zig rename to test/stage1/behavior/namespace_depends_on_compile_var.zig index 32feaced1030101d6517e41278f04376bf94ecf2..4c4fc4eefea30ac89f75d7d070e927a5ea425b9e 100644 --- a/test/stage1/behavior/namespace_depends_on_compile_var/index.zig +++ b/test/stage1/behavior/namespace_depends_on_compile_var.zig @@ -9,6 +9,6 @@ test "namespace depends on compile var" { } } const some_namespace = switch (builtin.os) { - builtin.Os.linux => @import("a.zig"), - else => @import("b.zig"), + builtin.Os.linux => @import("namespace_depends_on_compile_var/a.zig"), + else => @import("namespace_depends_on_compile_var/b.zig"), }; diff --git a/test/stage1/behavior/pub_enum/index.zig b/test/stage1/behavior/pub_enum.zig similarity index 85% rename from test/stage1/behavior/pub_enum/index.zig rename to test/stage1/behavior/pub_enum.zig index 15e4114c2d1f1b3d08c36003ebc2287cd4f73e89..6275be7a0190204d60129926f26add2c4f2b3347 100644 --- a/test/stage1/behavior/pub_enum/index.zig +++ b/test/stage1/behavior/pub_enum.zig @@ -1,4 +1,4 @@ -const other = @import("other.zig"); +const other = @import("pub_enum/other.zig"); const expect = @import("std").testing.expect; test "pub enum" { -- 2.54.0