Merge remote-tracking branch 'origin/main'

Author: Khitiara

build.zig

@@ -138,7 +138,7 @@ pub fn build(b: *std.Build) void {
     b.installArtifact(mkfs_fat);
 
     // Usage:
-    var self_dep = std.Build.Dependency{
+    var self_dep: std.Build.Dependency = .{
         .builder = b,
     };
     usageDemo(b, &self_dep, debug_step);
@@ -175,7 +175,7 @@ fn installDebugDisk(
 pub fn initializeDisk(dependency: *std.Build.Dependency, size: u64, content: Content) *InitializeDiskStep {
     const ids = dependency.builder.allocator.create(InitializeDiskStep) catch @panic("out of memory");
 
-    ids.* = InitializeDiskStep{
+    ids.* = .{
         .step = std.Build.Step.init(.{
             .owner = dependency.builder, // TODO: Is this correct?
             .id = .custom,
@@ -563,7 +563,7 @@ pub const InitializeDiskStep = struct {
             try disk.writeAll("\x00");
             try disk.seekTo(0);
 
-            var context = HumanContext{};
+            var context: HumanContext = .{};
             context.appendSliceAssumeCapacity("disk");
 
             const disk_image = DiskImage{
@@ -943,9 +943,9 @@ pub const FileSystem = struct {
         ///  <ops...> is a list of operations that should be performed on the file system:
         ///  - format            Formats the disk image.
         ///  - mount             Mounts the file system, must be before all following:
-        ///  - mkdir:<dst>       Creates directory <dst> and all necessary parents.
-        ///  - file:<src>:<dst>  Copy <src> to path <dst>. If <dst> exists, it will be overwritten.
-        ///  - dir:<src>:<dst>   Copy <src> recursively into <dst>. If <dst> exists, they will be merged.
+        ///  - mkdir;<dst>       Creates directory <dst> and all necessary parents.
+        ///  - file;<src>;<dst>  Copy <src> to path <dst>. If <dst> exists, it will be overwritten.
+        ///  - dir;<src>;<dst>   Copy <src> recursively into <dst>. If <dst> exists, they will be merged.
         ///
         /// <dst> paths are always rooted, even if they don't start with a /, and always use / as a path separator.
         ///
@@ -986,7 +986,7 @@ pub const FileSystemBuilder = struct {
         format: FileSystem.Format,
         label: []const u8,
     }) FileSystem {
-        return FileSystem{
+        return .{
             .format = options.format,
             .label = fsb.b.dupe(options.label),
             .items = fsb.list.toOwnedSlice(fsb.b.allocator) catch @panic("out of memory"),

src/mkfs.fat.zig

@@ -12,7 +12,7 @@ pub const std_options: std.Options = .{
     },
 };
 
-var fat_disk: fatfs.Disk = fatfs.Disk{
+var fat_disk: fatfs.Disk = .{
     .getStatusFn = disk_getStatus,
     .initializeFn = disk_initialize,
     .readFn = disk_read,
@@ -81,7 +81,7 @@ pub fn mkfile(path: []const u8, host_file: std.fs.File) !void {
 
 fn disk_getStatus(intf: *fatfs.Disk) fatfs.Disk.Status {
     _ = intf;
-    return fatfs.Disk.Status{
+    return .{
         .initialized = true,
         .disk_present = true,
         .write_protected = false,

src/shared.zig

@@ -8,9 +8,9 @@ const std = @import("std");
 //  <ops...> is a list of operations that should be performed on the file system:
 //  - format            Formats the disk image.
 //  - mount             Mounts the file system, must be before all following:
-//  - mkdir:<dst>       Creates directory <dst> and all necessary parents.
-//  - file:<src>:<dst>  Copy <src> to path <dst>. If <dst> exists, it will be overwritten.
-//  - dir:<src>:<dst>   Copy <src> recursively into <dst>. If <dst> exists, they will be merged.
+//  - mkdir;<dst>       Creates directory <dst> and all necessary parents.
+//  - file;<src>;<dst>  Copy <src> to path <dst>. If <dst> exists, it will be overwritten.
+//  - dir;<src>;<dst>   Copy <src> recursively into <dst>. If <dst> exists, they will be merged.
 //
 // <dst> paths are always rooted, even if they don't start with a /, and always use / as a path separator.
 //
@@ -56,7 +56,7 @@ pub fn App(comptime Context: type) type {
             if (byte_base + byte_len > stat.size)
                 return mistake("invalid offsets.", .{});
 
-            device = BlockDevice{
+            device = .{
                 .file = &image_file,
                 .base = byte_base,
                 .count = byte_len / BlockDevice.block_size,
@@ -84,15 +84,15 @@ pub fn App(comptime Context: type) type {
                         try Context.mount();
                     },
                     .mkdir => {
-                        const dir = try normalize(cmd_iter.next() orelse return mistake("mkdir:<dst> is missing it's <dst> path!", .{}));
+                        const dir = try normalize(cmd_iter.next() orelse return mistake("mkdir;<dst> is missing it's <dst> path!", .{}));
 
                         // std.log.info("mkdir(\"{}\")", .{std.zig.fmtEscapes(dir)});
 
                         try recursiveMkDir(dir);
                     },
                     .file => {
-                        const src = cmd_iter.next() orelse return mistake("file:<src>:<dst> is missing it's <src> path!", .{});
-                        const dst = try normalize(cmd_iter.next() orelse return mistake("file:<src>:<dst> is missing it's <dst> path!", .{}));
+                        const src = cmd_iter.next() orelse return mistake("file;<src>;<dst> is missing it's <src> path!", .{});
+                        const dst = try normalize(cmd_iter.next() orelse return mistake("file;<src>;<dst> is missing it's <dst> path!", .{}));
 
                         // std.log.info("file(\"{}\", \"{}\")", .{ std.zig.fmtEscapes(src), std.zig.fmtEscapes(dst) });
 
@@ -108,10 +108,8 @@ pub fn App(comptime Context: type) type {
                         try addFile(file, dst);
                     },
                     .dir => {
-                        const src = cmd_iter.next() orelse return mistake("dir:<src>:<dst> is missing it's <src> path!", .{});
-                        const dst = try normalize(cmd_iter.next() orelse return mistake("dir:<src>:<dst> is missing it's <dst> path!", .{}));
-
-                        // std.log.info("dir(\"{}\", \"{}\")", .{ std.zig.fmtEscapes(src), std.zig.fmtEscapes(dst) });
+                        const src = cmd_iter.next() orelse return mistake("dir;<src>;<dst> is missing it's <src> path!", .{});
+                        const dst = try normalize(cmd_iter.next() orelse return mistake("dir;<src>;<dst> is missing it's <dst> path!", .{}));
 
                         var iter_dir = try std.fs.cwd().openDir(src, .{ .iterate = true });
                         defer iter_dir.close();