tar: remove output

Replaced with writer.
ziglang · Apr 12, 2024 · 34607df · 34607df
1 parent 7ac8d0a
commit 34607df
Show file tree

Hide file tree

Showing 5 changed files with 2 additions and 339 deletions.
diff --git a/lib/compiler/std-docs.zig b/lib/compiler/std-docs.zig
@@ -207,8 +207,8 @@ fn serveSourcesTar(request: *std.http.Server.Request, context: *Context) !void {
         // Since this command is JIT compiled, the builtin module available in
         // this source file corresponds to the user's host system.
         const builtin_zig = @embedFile("builtin");
-        archiver.prefix = "builtin";
         var stream = std.io.fixedBufferStream(builtin_zig);
+        archiver.prefix = "builtin";
         try archiver.addFile("builtin.zig", builtin_zig.len, stream.reader(), .{});
     }
 

diff --git a/lib/std/tar.zig b/lib/std/tar.zig
@@ -19,7 +19,6 @@ const std = @import("std");
 const assert = std.debug.assert;
 const testing = std.testing;
 
-pub const output = @import("tar/output.zig");
 pub const writer = @import("tar/writer.zig").writer;
 
 /// Provide this to receive detailed error messages.

diff --git a/lib/std/tar/output.zig b/lib/std/tar/output.zig
diff --git a/lib/std/tar/writer.zig b/lib/std/tar/writer.zig
@@ -520,107 +520,3 @@ pub fn main() !void {
     }
     try cmp.finish();
 }
-
-test "sourcesTar" {
-    const gpa = testing.allocator;
-    var lib_dir = try std.fs.cwd().openDir("/home/ianic/Code/zig/lib", .{});
-    var out_dir = try std.fs.cwd().openDir("/home/ianic/Code/tmp", .{});
-
-    // previous version
-    {
-        var out_file = try out_dir.createFile("sources.tar", .{});
-        defer out_file.close();
-        var w = out_file.writer();
-
-        var std_dir = try lib_dir.openDir("std", .{ .iterate = true });
-        defer std_dir.close();
-
-        var walker = try std_dir.walk(gpa);
-        defer walker.deinit();
-
-        while (try walker.next()) |entry| {
-            switch (entry.kind) {
-                .file => {
-                    if (!std.mem.endsWith(u8, entry.basename, ".zig"))
-                        continue;
-                    if (std.mem.endsWith(u8, entry.basename, "test.zig"))
-                        continue;
-                },
-                else => continue,
-            }
-
-            var file = try std_dir.openFile(entry.path, .{});
-            defer file.close();
-
-            const stat = try file.stat();
-            const padding = p: {
-                const remainder = stat.size % 512;
-                break :p if (remainder > 0) 512 - remainder else 0;
-            };
-
-            var file_header = std.tar.output.Header.init();
-            file_header.typeflag = .regular;
-            try file_header.setPath("std", entry.path);
-            try file_header.setSize(stat.size);
-            try file_header.updateChecksum();
-            try w.writeAll(std.mem.asBytes(&file_header));
-            try w.any().writeFile(file);
-            try w.writeByteNTimes(0, padding);
-        }
-
-        {
-            // Since this command is JIT compiled, the builtin module available in
-            // this source file corresponds to the user's host system.
-            const builtin_zig = @embedFile("builtin");
-
-            var file_header = std.tar.output.Header.init();
-            file_header.typeflag = .regular;
-            try file_header.setPath("builtin", "builtin.zig");
-            try file_header.setSize(builtin_zig.len);
-            try file_header.updateChecksum();
-            try w.writeAll(std.mem.asBytes(&file_header));
-            try w.writeAll(builtin_zig);
-            const padding = p: {
-                const remainder = builtin_zig.len % 512;
-                break :p if (remainder > 0) 512 - remainder else 0;
-            };
-            try w.writeByteNTimes(0, padding);
-        }
-    }
-
-    // this version
-    {
-        var out_file = try out_dir.createFile("sources_new.tar", .{});
-        defer out_file.close();
-        var w = writer(out_file.writer());
-        try w.setRoot("std");
-
-        var std_dir = try lib_dir.openDir("std", .{ .iterate = true });
-        defer std_dir.close();
-
-        var walker = try std_dir.walk(gpa);
-        defer walker.deinit();
-
-        while (try walker.next()) |entry| {
-            switch (entry.kind) {
-                .file => {
-                    if (!std.mem.endsWith(u8, entry.basename, ".zig"))
-                        continue;
-                    if (std.mem.endsWith(u8, entry.basename, "test.zig"))
-                        continue;
-                },
-                else => continue,
-            }
-            try w.addEntry(entry);
-        }
-
-        {
-            w.prefix = "builtin";
-            // Since this command is JIT compiled, the builtin module available in
-            // this source file corresponds to the user's host system.
-            const builtin_zig = @embedFile("builtin");
-            var stm = std.io.fixedBufferStream(builtin_zig);
-            try w.addFile("builtin.zig", builtin_zig.len, stm.reader(), .{});
-        }
-    }
-}
diff --git a/src/Compilation.zig b/src/Compilation.zig
@@ -3762,6 +3762,7 @@ fn docsCopyModule(comp: *Compilation, module: *Package.Module, tar_file: std.fs.
     defer walker.deinit();
 
     var archiver = std.tar.writer(tar_file.writer());
+    archiver.prefix = module.fully_qualified_name;
 
     while (try walker.next()) |entry| {
         switch (entry.kind) {
@@ -3772,7 +3773,6 @@ fn docsCopyModule(comp: *Compilation, module: *Package.Module, tar_file: std.fs.
             },
             else => continue,
         }
-        archiver.prefix = module.fully_qualified_name;
         archiver.addEntry(entry) catch |err| {
             return comp.lockAndSetMiscFailure(.docs_copy, "unable to archive '{}{s}': {s}", .{
                 root, entry.path, @errorName(err),