Commit 1ca5f06762401d2e90c8119acb4837571696dd5e | zig

author	daurnimator <quae@daurnimator.com> 2020-01-16 12:21:00+10:00
committer	Andrew Kelley <andrew@ziglang.org> 2020-03-03 13:25:43-05:00
log	1ca5f06762401d2e90c8119acb4837571696dd5e
tree	156e1e5f40abfc798301f35be792463c8bf5b4fe
parent	695b0976c3757325d4b2043151d267bcc7490f7e
signature	Commit is signed but in an unrecognized format.

6 files changed, 11 insertions(+), 12 deletions(-)

lib/std/build.zig+2-2

...	...	@@ -763,7 +763,7 @@ pub const Builder = struct {
763	763	}
764	764
765	765	pub fn makePath(self: *Builder, path: []const u8) !void {
766		fs.makePath(self.allocator, self.pathFromRoot(path)) catch \|err\| {
	766	fs.cwd().makePath(self.pathFromRoot(path)) catch \|err\| {
767	767	warn("Unable to create path {}: {}\n", .{ path, @errorName(err) });
768	768	return err;
769	769	};
...	...	@@ -2311,7 +2311,7 @@ pub const InstallDirStep = struct {
2311	2311	const rel_path = entry.path[full_src_dir.len + 1 ..];
2312	2312	const dest_path = try fs.path.join(self.builder.allocator, &[_][]const u8{ dest_prefix, rel_path });
2313	2313	switch (entry.kind) {
2314		.Directory => try fs.makePath(self.builder.allocator, dest_path),
	2314	.Directory => try fs.cwd().makePath(dest_path),
2315	2315	.File => try self.builder.updateFile(entry.path, dest_path),
2316	2316	else => continue,
2317	2317	}

lib/std/build/write_file.zig+1-1

...	...	@@ -74,7 +74,7 @@ pub const WriteFileStep = struct {
74	74	&hash_basename,
75	75	});
76	76	// TODO replace with something like fs.makePathAndOpenDir
77		fs.makePath(self.builder.allocator, self.output_dir) catch \|err\| {
	77	fs.cwd().makePath(self.output_dir) catch \|err\| {
78	78	warn("unable to make path {}: {}\n", .{ self.output_dir, @errorName(err) });
79	79	return err;
80	80	};

lib/std/fs/watch.zig+2-3

...	...	@@ -618,11 +618,10 @@ test "write a file, watch it, write it again" {
618	618	// TODO re-enable this test
619	619	if (true) return error.SkipZigTest;
620	620
621		const allocator = std.heap.page_allocator;
622
623		try os.makePath(allocator, test_tmp_dir);
	621	try fs.cwd().makePath(test_tmp_dir);
624	622	defer os.deleteTree(test_tmp_dir) catch {};
625	623
	624	const allocator = std.heap.page_allocator;
626	625	return testFsWatch(&allocator);
627	626	}
628	627

lib/std/os/test.zig+2-2

...	...	@@ -16,7 +16,7 @@ const AtomicRmwOp = builtin.AtomicRmwOp;
16	16	const AtomicOrder = builtin.AtomicOrder;
17	17
18	18	test "makePath, put some files in it, deleteTree" {
19		try fs.makePath(a, "os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c");
	19	try fs.cwd().makePath("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c");
20	20	try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "c" ++ fs.path.sep_str ++ "file.txt", "nonsense");
21	21	try io.writeFile("os_test_tmp" ++ fs.path.sep_str ++ "b" ++ fs.path.sep_str ++ "file2.txt", "blah");
22	22	try fs.deleteTree("os_test_tmp");
...	...	@@ -28,7 +28,7 @@ test "makePath, put some files in it, deleteTree" {
28	28	}
29	29
30	30	test "access file" {
31		try fs.makePath(a, "os_test_tmp");
	31	try fs.cwd().makePath("os_test_tmp");
32	32	if (fs.cwd().access("os_test_tmp" ++ fs.path.sep_str ++ "file.txt", .{})) \|ok\| {
33	33	@panic("expected error");
34	34	} else \|err\| {

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

...	...	@@ -1179,7 +1179,7 @@ pub const Compilation = struct {
1179	1179	defer self.gpa().free(zig_dir_path);
1180	1180
1181	1181	const tmp_dir = try fs.path.join(self.arena(), &[_][]const u8{ zig_dir_path, comp_dir_name[0..] });
1182		try fs.makePath(self.gpa(), tmp_dir);
	1182	try fs.cwd().makePath(tmp_dir);
1183	1183	return tmp_dir;
1184	1184	}
1185	1185

src-self-hosted/test.zig+3-3

...	...	@@ -56,7 +56,7 @@ pub const TestContext = struct {
56	56	self.zig_lib_dir = try introspect.resolveZigLibDir(allocator);
57	57	errdefer allocator.free(self.zig_lib_dir);
58	58
59		try std.fs.makePath(allocator, tmp_dir_name);
	59	try std.fs.cwd().makePath(tmp_dir_name);
60	60	errdefer std.fs.deleteTree(tmp_dir_name) catch {};
61	61	}
62	62
...	...	@@ -85,7 +85,7 @@ pub const TestContext = struct {
85	85	const file1_path = try std.fs.path.join(allocator, [_][]const u8{ tmp_dir_name, file_index, file1 });
86	86
87	87	if (std.fs.path.dirname(file1_path)) \|dirname\| {
88		try std.fs.makePath(allocator, dirname);
	88	try std.fs.cwd().makePath(dirname);
89	89	}
90	90
91	91	// TODO async I/O
...	...	@@ -119,7 +119,7 @@ pub const TestContext = struct {
119	119
120	120	const output_file = try std.fmt.allocPrint(allocator, "{}-out{}", .{ file1_path, (Target{ .Native = {} }).exeFileExt() });
121	121	if (std.fs.path.dirname(file1_path)) \|dirname\| {
122		try std.fs.makePath(allocator, dirname);
	122	try std.fs.cwd().makePath(dirname);
123	123	}
124	124
125	125	// TODO async I/O