Merge pull request #3873 from ziglang/format-no-var-args

std.fmt.format: tuple parameter instead of var args

1 files changed, 11 insertions, 11 deletions

diff --git a/lib/std/progress.zig b/lib/std/progress.zig
index 034d7ade26..1c5ecd261a 100644
--- a/lib/std/progress.zig
+++ b/lib/std/progress.zig
@@ -130,11 +130,11 @@ pub const Progress = struct {
         var end: usize = 0;
         if (self.columns_written > 0) {
             // restore cursor position
-            end += (std.fmt.bufPrint(self.output_buffer[end..], "\x1b[{}D", self.columns_written) catch unreachable).len;
+            end += (std.fmt.bufPrint(self.output_buffer[end..], "\x1b[{}D", .{self.columns_written}) catch unreachable).len;
             self.columns_written = 0;
 
             // clear rest of line
-            end += (std.fmt.bufPrint(self.output_buffer[end..], "\x1b[0K") catch unreachable).len;
+            end += (std.fmt.bufPrint(self.output_buffer[end..], "\x1b[0K", .{}) catch unreachable).len;
         }
 
         if (!self.done) {
@@ -142,28 +142,28 @@ pub const Progress = struct {
             var maybe_node: ?*Node = &self.root;
             while (maybe_node) |node| {
                 if (need_ellipse) {
-                    self.bufWrite(&end, "...");
+                    self.bufWrite(&end, "...", .{});
                 }
                 need_ellipse = false;
                 if (node.name.len != 0 or node.estimated_total_items != null) {
                     if (node.name.len != 0) {
-                        self.bufWrite(&end, "{}", node.name);
+                        self.bufWrite(&end, "{}", .{node.name});
                         need_ellipse = true;
                     }
                     if (node.estimated_total_items) |total| {
-                        if (need_ellipse) self.bufWrite(&end, " ");
-                        self.bufWrite(&end, "[{}/{}] ", node.completed_items + 1, total);
+                        if (need_ellipse) self.bufWrite(&end, " ", .{});
+                        self.bufWrite(&end, "[{}/{}] ", .{ node.completed_items + 1, total });
                         need_ellipse = false;
                     } else if (node.completed_items != 0) {
-                        if (need_ellipse) self.bufWrite(&end, " ");
-                        self.bufWrite(&end, "[{}] ", node.completed_items + 1);
+                        if (need_ellipse) self.bufWrite(&end, " ", .{});
+                        self.bufWrite(&end, "[{}] ", .{node.completed_items + 1});
                         need_ellipse = false;
                     }
                 }
                 maybe_node = node.recently_updated_child;
             }
             if (need_ellipse) {
-                self.bufWrite(&end, "...");
+                self.bufWrite(&end, "...", .{});
             }
         }
 
@@ -174,7 +174,7 @@ pub const Progress = struct {
         self.prev_refresh_timestamp = self.timer.read();
     }
 
-    pub fn log(self: *Progress, comptime format: []const u8, args: ...) void {
+    pub fn log(self: *Progress, comptime format: []const u8, args: var) void {
         const file = self.terminal orelse return;
         self.refresh();
         file.outStream().stream.print(format, args) catch {
@@ -184,7 +184,7 @@ pub const Progress = struct {
         self.columns_written = 0;
     }
 
-    fn bufWrite(self: *Progress, end: *usize, comptime format: []const u8, args: ...) void {
+    fn bufWrite(self: *Progress, end: *usize, comptime format: []const u8, args: var) void {
         if (std.fmt.bufPrint(self.output_buffer[end.*..], format, args)) |written| {
             const amt = written.len;
             end.* += amt;