Commit bfc86776d501dc317737be09e8ed8d13da18f67c | zig

author	Andrew Kelley <andrew@ziglang.org> 2019-05-29 18:55:42-04:00
committer	Andrew Kelley <andrew@ziglang.org> 2019-05-29 19:09:58-04:00
log	bfc86776d501dc317737be09e8ed8d13da18f67c
tree	805594b08d7b54b1e742034ee594a05725a0d9ef
parent	8a4ee5942b996d2ffe9c61d7d73fe10f8b1ecea4
signature	Commit is signed but in an unrecognized format.

run zig fmt to update `use` to `usingnamespace`

39 files changed, 32 insertions(+), 44 deletions(-)

src-self-hosted
- c.zig
- translate_c.zig
std
- c.zig
- c
  - darwin.zig
  - linux.zig
- math
  - big.zig
- os.zig
- os
  - bits.zig
  - bits
    linux.zig
    windows.zig
  - darwin.zig
  - freebsd.zig
  - linux.zig
  - linux
    x86_64.zig
  - netbsd.zig
  - wasi.zig
  - windows.zig
  - windows
    advapi32.zig
    kernel32.zig
    ntdll.zig
    ole32.zig
    shell32.zig
  - zen.zig
test
- stage1
  - behavior
    alignof.zig
    bugs
    1076.zig
    1486.zig
    421.zig
    529.zig
    726.zig
    fn.zig
    import.zig
    popcount.zig
    reflection.zig
    struct.zig
    this.zig
    undefined.zig
    union.zig
    widening.zig
- standalone
  - use_alias
    c.zig

src-self-hosted/c.zig+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	pub use @cImport({	1	pub usingnamespace @cImport({
2	@cDefine("__STDC_CONSTANT_MACROS", "");	2	@cDefine("__STDC_CONSTANT_MACROS", "");
3	@cDefine("__STDC_LIMIT_MACROS", "");	3	@cDefine("__STDC_LIMIT_MACROS", "");
4	@cInclude("inttypes.h");	4	@cInclude("inttypes.h");

src-self-hosted/translate_c.zig+1-1

...	@@ -6,7 +6,7 @@ const builtin = @import("builtin");	...	@@ -6,7 +6,7 @@ const builtin = @import("builtin");
6	const assert = std.debug.assert;	6	const assert = std.debug.assert;
7	const ast = std.zig.ast;	7	const ast = std.zig.ast;
8	const Token = std.zig.Token;	8	const Token = std.zig.Token;
9	use @import("clang.zig");	9	usingnamespace @import("clang.zig");
10		10
11	pub const Mode = enum {	11	pub const Mode = enum {
12	import,	12	import,

std/c.zig+2-2

...	@@ -2,9 +2,9 @@ const builtin = @import("builtin");	...	@@ -2,9 +2,9 @@ const builtin = @import("builtin");
2	const std = @import("std");	2	const std = @import("std");
3	const page_size = std.mem.page_size;	3	const page_size = std.mem.page_size;
4		4
5	pub use @import("os/bits.zig");	5	pub usingnamespace @import("os/bits.zig");
6		6
7	pub use switch (builtin.os) {	7	pub usingnamespace switch (builtin.os) {
8	.linux => @import("c/linux.zig"),	8	.linux => @import("c/linux.zig"),
9	.windows => @import("c/windows.zig"),	9	.windows => @import("c/windows.zig"),
10	.macosx, .ios, .tvos, .watchos => @import("c/darwin.zig"),	10	.macosx, .ios, .tvos, .watchos => @import("c/darwin.zig"),

std/c/darwin.zig+1-1

...	@@ -3,7 +3,7 @@ const assert = std.debug.assert;	...	@@ -3,7 +3,7 @@ const assert = std.debug.assert;
3	const builtin = @import("builtin");	3	const builtin = @import("builtin");
4	const macho = std.macho;	4	const macho = std.macho;
5		5
6	use @import("../os/bits.zig");	6	usingnamespace @import("../os/bits.zig");
7		7
8	extern "c" fn __error() *c_int;	8	extern "c" fn __error() *c_int;
9	pub extern "c" fn _NSGetExecutablePath(buf: []u8, bufsize: u32) c_int;	9	pub extern "c" fn _NSGetExecutablePath(buf: []u8, bufsize: u32) c_int;

std/c/linux.zig+1-1

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	const std = @import("../std.zig");	1	const std = @import("../std.zig");
2	use std.c;	2	usingnamespace std.c;
3		3
4	extern "c" fn __errno_location() *c_int;	4	extern "c" fn __errno_location() *c_int;
5	pub const _errno = __errno_location;	5	pub const _errno = __errno_location;

std/math/big.zig+2-2

...	@@ -1,5 +1,5 @@	...	@@ -1,5 +1,5 @@
1	pub use @import("big/int.zig");	1	pub usingnamespace @import("big/int.zig");
2	pub use @import("big/rational.zig");	2	pub usingnamespace @import("big/rational.zig");
3		3
4	test "math.big" {	4	test "math.big" {
5	_ = @import("big/int.zig");	5	_ = @import("big/int.zig");

std/os.zig+1-1

...	@@ -46,7 +46,7 @@ pub const system = if (builtin.link_libc) std.c else switch (builtin.os) {	...	@@ -46,7 +46,7 @@ pub const system = if (builtin.link_libc) std.c else switch (builtin.os) {
46	else => struct {},	46	else => struct {},
47	};	47	};
48		48
49	pub use @import("os/bits.zig");	49	pub usingnamespace @import("os/bits.zig");
50		50
51	/// See also `getenv`. Populated by startup code before main().	51	/// See also `getenv`. Populated by startup code before main().
52	pub var environ: [][*]u8 = undefined;	52	pub var environ: [][*]u8 = undefined;

std/os/bits.zig+1-1

...	@@ -3,7 +3,7 @@	...	@@ -3,7 +3,7 @@
3		3
4	const builtin = @import("builtin");	4	const builtin = @import("builtin");
5		5
6	pub use switch (builtin.os) {	6	pub usingnamespace switch (builtin.os) {
7	.macosx, .ios, .tvos, .watchos => @import("bits/darwin.zig"),	7	.macosx, .ios, .tvos, .watchos => @import("bits/darwin.zig"),
8	.freebsd => @import("bits/freebsd.zig"),	8	.freebsd => @import("bits/freebsd.zig"),
9	.linux => @import("bits/linux.zig"),	9	.linux => @import("bits/linux.zig"),

std/os/bits/linux.zig+3-3

...	@@ -1,10 +1,10 @@	...	@@ -1,10 +1,10 @@
1	const builtin = @import("builtin");	1	const builtin = @import("builtin");
2	const std = @import("../../std.zig");	2	const std = @import("../../std.zig");
3	const maxInt = std.math.maxInt;	3	const maxInt = std.math.maxInt;
4	use @import("../bits.zig");	4	usingnamespace @import("../bits.zig");
5		5
6	pub use @import("linux/errno.zig");	6	pub usingnamespace @import("linux/errno.zig");
7	pub use switch (builtin.arch) {	7	pub usingnamespace switch (builtin.arch) {
8	.x86_64 => @import("linux/x86_64.zig"),	8	.x86_64 => @import("linux/x86_64.zig"),
9	.aarch64 => @import("linux/arm64.zig"),	9	.aarch64 => @import("linux/arm64.zig"),
10	else => struct {},	10	else => struct {},

std/os/bits/windows.zig+1-1

...	@@ -1,6 +1,6 @@	...	@@ -1,6 +1,6 @@
1	// The reference for these types and values is Microsoft Windows's ucrt (Universal C RunTime).	1	// The reference for these types and values is Microsoft Windows's ucrt (Universal C RunTime).
2		2
3	use @import("../windows/bits.zig");	3	usingnamespace @import("../windows/bits.zig");
4		4
5	pub const fd_t = HANDLE;	5	pub const fd_t = HANDLE;
6	pub const pid_t = HANDLE;	6	pub const pid_t = HANDLE;

std/os/darwin.zig+1-1

...	@@ -4,4 +4,4 @@ pub const is_the_target = switch (builtin.os) {	...	@@ -4,4 +4,4 @@ pub const is_the_target = switch (builtin.os) {
4	.macosx, .tvos, .watchos, .ios => true,	4	.macosx, .tvos, .watchos, .ios => true,
5	else => false,	5	else => false,
6	};	6	};
7	pub use std.c;	7	pub usingnamespace std.c;

std/os/freebsd.zig+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	const std = @import("../std.zig");	1	const std = @import("../std.zig");
2	const builtin = @import("builtin");	2	const builtin = @import("builtin");
3	pub const is_the_target = builtin.os == .freebsd;	3	pub const is_the_target = builtin.os == .freebsd;
4	pub use std.c;	4	pub usingnamespace std.c;

std/os/linux.zig+2-2

...	@@ -14,12 +14,12 @@ const vdso = @import("linux/vdso.zig");	...	@@ -14,12 +14,12 @@ const vdso = @import("linux/vdso.zig");
14	const dl = @import("../dynamic_library.zig");	14	const dl = @import("../dynamic_library.zig");
15		15
16	pub const is_the_target = builtin.os == .linux;	16	pub const is_the_target = builtin.os == .linux;
17	pub use switch (builtin.arch) {	17	pub usingnamespace switch (builtin.arch) {
18	.x86_64 => @import("linux/x86_64.zig"),	18	.x86_64 => @import("linux/x86_64.zig"),
19	.aarch64 => @import("linux/arm64.zig"),	19	.aarch64 => @import("linux/arm64.zig"),
20	else => struct {},	20	else => struct {},
21	};	21	};
22	pub use @import("bits.zig");	22	pub usingnamespace @import("bits.zig");
23	pub const tls = @import("linux/tls.zig");	23	pub const tls = @import("linux/tls.zig");
24		24
25	/// Set by startup code, used by `getauxval`.	25	/// Set by startup code, used by `getauxval`.

std/os/linux/x86_64.zig+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	use @import("../bits.zig");	1	usingnamespace @import("../bits.zig");
2		2
3	pub fn syscall0(number: usize) usize {	3	pub fn syscall0(number: usize) usize {
4	return asm volatile ("syscall"	4	return asm volatile ("syscall"

std/os/netbsd.zig+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	const builtin = @import("builtin");	1	const builtin = @import("builtin");
2	const std = @import("../std.zig");	2	const std = @import("../std.zig");
3	pub const is_the_target = builtin.os == .netbsd;	3	pub const is_the_target = builtin.os == .netbsd;
4	pub use std.c;	4	pub usingnamespace std.c;

std/os/wasi.zig+1-1

...	@@ -5,7 +5,7 @@ const std = @import("std");	...	@@ -5,7 +5,7 @@ const std = @import("std");
5	const assert = std.debug.assert;	5	const assert = std.debug.assert;
6		6
7	pub const is_the_target = builtin.os == .wasi;	7	pub const is_the_target = builtin.os == .wasi;
8	pub use @import("bits.zig");	8	pub usingnamespace @import("bits.zig");
9		9
10	comptime {	10	comptime {
11	assert(@alignOf(i8) == 1);	11	assert(@alignOf(i8) == 1);

std/os/windows.zig+1-1

...	@@ -18,7 +18,7 @@ pub const ntdll = @import("windows/ntdll.zig");	...	@@ -18,7 +18,7 @@ pub const ntdll = @import("windows/ntdll.zig");
18	pub const ole32 = @import("windows/ole32.zig");	18	pub const ole32 = @import("windows/ole32.zig");
19	pub const shell32 = @import("windows/shell32.zig");	19	pub const shell32 = @import("windows/shell32.zig");
20		20
21	pub use @import("windows/bits.zig");	21	pub usingnamespace @import("windows/bits.zig");
22		22
23	pub const CreateFileError = error{	23	pub const CreateFileError = error{
24	SharingViolation,	24	SharingViolation,

std/os/windows/advapi32.zig+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	use @import("bits.zig");	1	usingnamespace @import("bits.zig");
2		2
3	pub extern "advapi32" stdcallcc fn RegOpenKeyExW(	3	pub extern "advapi32" stdcallcc fn RegOpenKeyExW(
4	hKey: HKEY,	4	hKey: HKEY,

std/os/windows/kernel32.zig+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	use @import("bits.zig");	1	usingnamespace @import("bits.zig");
2		2
3	pub extern "kernel32" stdcallcc fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVERLAPPED) BOOL;	3	pub extern "kernel32" stdcallcc fn CancelIoEx(hFile: HANDLE, lpOverlapped: LPOVERLAPPED) BOOL;
4		4

std/os/windows/ntdll.zig+1-1

...	@@ -1,3 +1,3 @@	...	@@ -1,3 +1,3 @@
1	use @import("bits.zig");	1	usingnamespace @import("bits.zig");
2		2
3	pub extern "NtDll" stdcallcc fn RtlCaptureStackBackTrace(FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: *c_void, BackTraceHash: ?DWORD) WORD;	3	pub extern "NtDll" stdcallcc fn RtlCaptureStackBackTrace(FramesToSkip: DWORD, FramesToCapture: DWORD, BackTrace: *c_void, BackTraceHash: ?DWORD) WORD;

std/os/windows/ole32.zig+1-1

...	@@ -1,4 +1,4 @@	...	@@ -1,4 +1,4 @@
1	use @import("bits.zig");	1	usingnamespace @import("bits.zig");
2		2
3	pub extern "ole32" stdcallcc fn CoTaskMemFree(pv: LPVOID) void;	3	pub extern "ole32" stdcallcc fn CoTaskMemFree(pv: LPVOID) void;
4	pub extern "ole32" stdcallcc fn CoUninitialize() void;	4	pub extern "ole32" stdcallcc fn CoUninitialize() void;

std/os/windows/shell32.zig+1-1

...	@@ -1,3 +1,3 @@	...	@@ -1,3 +1,3 @@
1	use @import("bits.zig");	1	usingnamespace @import("bits.zig");
2		2
3	pub extern "shell32" stdcallcc fn SHGetKnownFolderPath(rfid: const KNOWNFOLDERID, dwFlags: DWORD, hToken: ?HANDLE, ppszPath: [*]WCHAR) HRESULT;	3	pub extern "shell32" stdcallcc fn SHGetKnownFolderPath(rfid: const KNOWNFOLDERID, dwFlags: DWORD, hToken: ?HANDLE, ppszPath: [*]WCHAR) HRESULT;

std/os/zen.zig+1-1

...	@@ -80,7 +80,7 @@ pub const STDOUT_FILENO = 1;	...	@@ -80,7 +80,7 @@ pub const STDOUT_FILENO = 1;
80	pub const STDERR_FILENO = 2;	80	pub const STDERR_FILENO = 2;
81		81
82	// FIXME: let's borrow Linux's error numbers for now.	82	// FIXME: let's borrow Linux's error numbers for now.
83	use @import("bits/linux/errno.zig");	83	usingnamespace @import("bits/linux/errno.zig");
84	// Get the errno from a syscall return value, or 0 for no error.	84	// Get the errno from a syscall return value, or 0 for no error.
85	pub fn getErrno(r: usize) usize {	85	pub fn getErrno(r: usize) usize {
86	const signed_r = @bitCast(isize, r);	86	const signed_r = @bitCast(isize, r);

test/stage1/behavior/alignof.zig-1

...	@@ -15,4 +15,3 @@ test "@alignOf(T) before referencing T" {	...	@@ -15,4 +15,3 @@ test "@alignOf(T) before referencing T" {
15	comptime expect(@alignOf(Foo) == 4);	15	comptime expect(@alignOf(Foo) == 4);
16	}	16	}
17	}	17	}
18

test/stage1/behavior/bugs/1076.zig-1

...	@@ -13,4 +13,3 @@ fn testCastPtrOfArrayToSliceAndPtr() void {	...	@@ -13,4 +13,3 @@ fn testCastPtrOfArrayToSliceAndPtr() void {
13	x[0] += 1;	13	x[0] += 1;
14	expect(mem.eql(u8, array[0..], "boeu"));	14	expect(mem.eql(u8, array[0..], "boeu"));
15	}	15	}
16

test/stage1/behavior/bugs/1486.zig-1

...	@@ -8,4 +8,3 @@ test "constant pointer to global variable causes runtime load" {	...	@@ -8,4 +8,3 @@ test "constant pointer to global variable causes runtime load" {
8	expect(&global == ptr);	8	expect(&global == ptr);
9	expect(ptr.* == 1234);	9	expect(ptr.* == 1234);
10	}	10	}
11

test/stage1/behavior/bugs/421.zig-1

...	@@ -13,4 +13,3 @@ fn extractOne64(a: u128) u64 {	...	@@ -13,4 +13,3 @@ fn extractOne64(a: u128) u64 {
13	const x = @bitCast([2]u64, a);	13	const x = @bitCast([2]u64, a);
14	return x[1];	14	return x[1];
15	}	15	}
16

test/stage1/behavior/bugs/529.zig-1

...	@@ -12,4 +12,3 @@ test "issue 529 fixed" {	...	@@ -12,4 +12,3 @@ test "issue 529 fixed" {
12	@import("529_other_file.zig").issue529(null);	12	@import("529_other_file.zig").issue529(null);
13	issue529(null);	13	issue529(null);
14	}	14	}
15

test/stage1/behavior/bugs/726.zig-1

...	@@ -13,4 +13,3 @@ test "@ptrCast from var in empty struct to nullable" {	...	@@ -13,4 +13,3 @@ test "@ptrCast from var in empty struct to nullable" {
13	var x: ?const u8 = @ptrCast(?const u8, &container.c);	13	var x: ?const u8 = @ptrCast(?const u8, &container.c);
14	expect(x.?.* == 4);	14	expect(x.?.* == 4);
15	}	15	}
16

test/stage1/behavior/fn.zig-1

...	@@ -205,4 +205,3 @@ test "extern struct with stdcallcc fn pointer" {	...	@@ -205,4 +205,3 @@ test "extern struct with stdcallcc fn pointer" {
205	s.ptr = S.foo;	205	s.ptr = S.foo;
206	expect(s.ptr() == 1234);	206	expect(s.ptr() == 1234);
207	}	207	}
208

test/stage1/behavior/import.zig+1-1

...	@@ -12,7 +12,7 @@ test "importing the same thing gives the same import" {	...	@@ -12,7 +12,7 @@ test "importing the same thing gives the same import" {
12		12
13	test "import in non-toplevel scope" {	13	test "import in non-toplevel scope" {
14	const S = struct {	14	const S = struct {
15	use @import("import/a_namespace.zig");	15	usingnamespace @import("import/a_namespace.zig");
16	};	16	};
17	expectEqual(i32(1234), S.foo());	17	expectEqual(i32(1234), S.foo());
18	}	18	}

test/stage1/behavior/popcount.zig-1

...	@@ -41,4 +41,3 @@ fn testPopCount() void {	...	@@ -41,4 +41,3 @@ fn testPopCount() void {
41	expect(@popCount(i128, 0b11111111000110001100010000100001000011000011100101010001) == 24);	41	expect(@popCount(i128, 0b11111111000110001100010000100001000011000011100101010001) == 24);
42	}	42	}
43	}	43	}
44

test/stage1/behavior/reflection.zig-1

...	@@ -93,4 +93,3 @@ const Bar = union(enum) {	...	@@ -93,4 +93,3 @@ const Bar = union(enum) {
93	Three: bool,	93	Three: bool,
94	Four: f64,	94	Four: f64,
95	};	95	};
96

test/stage1/behavior/struct.zig+1-1

...	@@ -552,7 +552,7 @@ test "packed struct with fp fields" {	...	@@ -552,7 +552,7 @@ test "packed struct with fp fields" {
552		552
553	test "use within struct scope" {	553	test "use within struct scope" {
554	const S = struct {	554	const S = struct {
555	use struct {	555	usingnamespace struct {
556	pub fn inner() i32 {	556	pub fn inner() i32 {
557	return 42;	557	return 42;
558	}	558	}

test/stage1/behavior/this.zig-1

...	@@ -32,4 +32,3 @@ test "this refer to container" {	...	@@ -32,4 +32,3 @@ test "this refer to container" {
32	expect(pt.x == 13);	32	expect(pt.x == 13);
33	expect(pt.y == 35);	33	expect(pt.y == 35);
34	}	34	}
35

test/stage1/behavior/undefined.zig-1

...	@@ -66,4 +66,3 @@ test "type name of undefined" {	...	@@ -66,4 +66,3 @@ test "type name of undefined" {
66	const x = undefined;	66	const x = undefined;
67	expect(mem.eql(u8, @typeName(@typeOf(x)), "(undefined)"));	67	expect(mem.eql(u8, @typeName(@typeOf(x)), "(undefined)"));
68	}	68	}
69

test/stage1/behavior/union.zig+1-1

...	@@ -374,7 +374,7 @@ const Attribute = union(enum) {	...	@@ -374,7 +374,7 @@ const Attribute = union(enum) {
374	fn setAttribute(attr: Attribute) void {}	374	fn setAttribute(attr: Attribute) void {}
375		375
376	fn Setter(attr: Attribute) type {	376	fn Setter(attr: Attribute) type {
377	return struct{	377	return struct {
378	fn set() void {	378	fn set() void {
379	setAttribute(attr);	379	setAttribute(attr);
380	}	380	}

test/stage1/behavior/widening.zig-1

...	@@ -25,4 +25,3 @@ test "float widening" {	...	@@ -25,4 +25,3 @@ test "float widening" {
25	var d: f128 = c;	25	var d: f128 = c;
26	expect(d == a);	26	expect(d == a);
27	}	27	}
28

test/standalone/use_alias/c.zig+1-1

...	@@ -1 +1 @@	...	@@ -1 +1 @@
1	pub use @cImport(@cInclude("foo.h"));	1	pub usingnamespace @cImport(@cInclude("foo.h"));