authorgravatar for takeshi@tetrate.ioTakeshi Yoneda <takeshi@tetrate.io> 2021-08-13 21:49:52+09:00
committergravatar for takeshi@tetrate.ioTakeshi Yoneda <takeshi@tetrate.io> 2021-08-13 21:49:52+09:00
logca4898c0f3590832d7a2ef84e8f4906e89d7f34e
tree83320bf6654b50b0b03dd1f7a33e123aedf8aa17
parent97560cd915008f04addc2c30af087aa89c162b02

Use std.buuiltin instead of importing builtin

Signed-off-by: Takeshi Yoneda <takeshi@tetrate.io>

2 files changed, 2 insertions(+), 3 deletions(-)

lib/std/fs/wasi.zig+1-1
...@@ -169,7 +169,7 @@ pub const PreopenList = struct {...@@ -169,7 +169,7 @@ pub const PreopenList = struct {
169};169};
170170
171test "extracting WASI preopens" {171test "extracting WASI preopens" {
172 if (std.builtin.os.tag != .wasi or @import("builtin").link_libc) return error.SkipZigTest;172 if (std.builtin.os.tag != .wasi or std.builtin.link_libc) return error.SkipZigTest;
173173
174 var preopens = PreopenList.init(std.testing.allocator);174 var preopens = PreopenList.init(std.testing.allocator);
175 defer preopens.deinit();175 defer preopens.deinit();
lib/std/testing.zig+1-2
...@@ -4,7 +4,6 @@...@@ -4,7 +4,6 @@
4// The MIT license requires this copyright notice to be included in all copies4// The MIT license requires this copyright notice to be included in all copies
5// and substantial portions of the software.5// and substantial portions of the software.
6const std = @import("std.zig");6const std = @import("std.zig");
7const builtin = @import("builtin");
87
9const math = std.math;8const math = std.math;
10const print = std.debug.print;9const print = std.debug.print;
...@@ -328,7 +327,7 @@ pub const TmpDir = struct {...@@ -328,7 +327,7 @@ pub const TmpDir = struct {
328};327};
329328
330fn getCwdOrWasiPreopen() std.fs.Dir {329fn getCwdOrWasiPreopen() std.fs.Dir {
331 if (std.builtin.os.tag == .wasi and !builtin.link_libc) {330 if (std.builtin.os.tag == .wasi and !std.builtin.link_libc) {
332 var preopens = std.fs.wasi.PreopenList.init(allocator);331 var preopens = std.fs.wasi.PreopenList.init(allocator);
333 defer preopens.deinit();332 defer preopens.deinit();
334 preopens.populate() catch333 preopens.populate() catch