From d21370833352369867596305dda99f8cafc69277 Mon Sep 17 00:00:00 2001 From: Andrew Kelley Date: Wed, 13 Mar 2019 13:45:51 -0400 Subject: [PATCH] this empty import workaround no longer necessary --- CMakeLists.txt | 1 - std/c.zig | 3 +-- std/empty.zig | 0 std/std.zig | 2 -- 4 files changed, 1 insertion(+), 5 deletions(-) delete mode 100644 std/empty.zig diff --git a/CMakeLists.txt b/CMakeLists.txt index 1f5d7e8258..a575f06481 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -476,7 +476,6 @@ set(ZIG_STD_FILES "dwarf.zig" "dynamic_library.zig" "elf.zig" - "empty.zig" "event.zig" "event/channel.zig" "event/fs.zig" diff --git a/std/c.zig b/std/c.zig index c7c8a9c550..de54c8f690 100644 --- a/std/c.zig +++ b/std/c.zig @@ -7,9 +7,8 @@ pub use switch (builtin.os) { Os.macosx, Os.ios => @import("c/darwin.zig"), Os.freebsd => @import("c/freebsd.zig"), Os.netbsd => @import("c/netbsd.zig"), - else => empty_import, + else => struct {}, }; -const empty_import = @import("empty.zig"); // TODO https://github.com/ziglang/zig/issues/265 on this whole file diff --git a/std/empty.zig b/std/empty.zig deleted file mode 100644 index e69de29bb2..0000000000 diff --git a/std/std.zig b/std/std.zig index d935f9136e..a0c6795827 100644 --- a/std/std.zig +++ b/std/std.zig @@ -24,7 +24,6 @@ pub const cstr = @import("cstr.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.zig"); pub const hash = @import("hash.zig"); @@ -72,7 +71,6 @@ test "std" { _ = @import("dwarf.zig"); _ = @import("dynamic_library.zig"); _ = @import("elf.zig"); - _ = @import("empty.zig"); _ = @import("event.zig"); _ = @import("fmt.zig"); _ = @import("hash.zig");