authorgravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-13 13:45:51-04:00
committergravatar for andrew@ziglang.orgAndrew Kelley <andrew@ziglang.org> 2019-03-13 14:13:09-04:00
logd21370833352369867596305dda99f8cafc69277
tree8bf773e5909871b7c68494fcdd8f833ef0a0d21e
parent0588fed15f64cc7d53eff2c599beb63ae2a589a0
signaturelock-open Commit is signed but in an unrecognized format.

this empty import workaround no longer necessary

4 files changed, 1 insertions(+), 5 deletions(-)

CMakeLists.txt-1
...@@ -476,7 +476,6 @@ set(ZIG_STD_FILES...@@ -476,7 +476,6 @@ set(ZIG_STD_FILES
476 "dwarf.zig"476 "dwarf.zig"
477 "dynamic_library.zig"477 "dynamic_library.zig"
478 "elf.zig"478 "elf.zig"
479 "empty.zig"
480 "event.zig"479 "event.zig"
481 "event/channel.zig"480 "event/channel.zig"
482 "event/fs.zig"481 "event/fs.zig"
std/c.zig+1-2
...@@ -7,9 +7,8 @@ pub use switch (builtin.os) {...@@ -7,9 +7,8 @@ pub use switch (builtin.os) {
7 Os.macosx, Os.ios => @import("c/darwin.zig"),7 Os.macosx, Os.ios => @import("c/darwin.zig"),
8 Os.freebsd => @import("c/freebsd.zig"),8 Os.freebsd => @import("c/freebsd.zig"),
9 Os.netbsd => @import("c/netbsd.zig"),9 Os.netbsd => @import("c/netbsd.zig"),
10 else => empty_import,10 else => struct {},
11};11};
12const empty_import = @import("empty.zig");
1312
14// TODO https://github.com/ziglang/zig/issues/265 on this whole file13// TODO https://github.com/ziglang/zig/issues/265 on this whole file
1514
std/empty.zig deleted
std/std.zig-2
...@@ -24,7 +24,6 @@ pub const cstr = @import("cstr.zig");...@@ -24,7 +24,6 @@ pub const cstr = @import("cstr.zig");
24pub const debug = @import("debug.zig");24pub const debug = @import("debug.zig");
25pub const dwarf = @import("dwarf.zig");25pub const dwarf = @import("dwarf.zig");
26pub const elf = @import("elf.zig");26pub const elf = @import("elf.zig");
27pub const empty_import = @import("empty.zig");
28pub const event = @import("event.zig");27pub const event = @import("event.zig");
29pub const fmt = @import("fmt.zig");28pub const fmt = @import("fmt.zig");
30pub const hash = @import("hash.zig");29pub const hash = @import("hash.zig");
...@@ -72,7 +71,6 @@ test "std" {...@@ -72,7 +71,6 @@ test "std" {
72 _ = @import("dwarf.zig");71 _ = @import("dwarf.zig");
73 _ = @import("dynamic_library.zig");72 _ = @import("dynamic_library.zig");
74 _ = @import("elf.zig");73 _ = @import("elf.zig");
75 _ = @import("empty.zig");
76 _ = @import("event.zig");74 _ = @import("event.zig");
77 _ = @import("fmt.zig");75 _ = @import("fmt.zig");
78 _ = @import("hash.zig");76 _ = @import("hash.zig");