diff --git a/CMakeLists.txt b/CMakeLists.txt index 2a93144d1d..6ec48c4382 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -434,7 +434,6 @@ set(ZIG_STAGE2_SOURCES lib/std/dwarf/OP.zig lib/std/dwarf/TAG.zig lib/std/elf.zig - lib/std/fifo.zig lib/std/fmt.zig lib/std/fmt/parse_float.zig lib/std/fs.zig diff --git a/lib/compiler/resinator/compile.zig b/lib/compiler/resinator/compile.zig index 1f35af8988..ab4784d9b0 100644 --- a/lib/compiler/resinator/compile.zig +++ b/lib/compiler/resinator/compile.zig @@ -1269,9 +1269,7 @@ pub const Compiler = struct { pub fn writeResourceDataNoPadding(writer: anytype, data_reader: anytype, data_size: u32) !void { var limited_reader = std.io.limitedReader(data_reader, data_size); - const FifoBuffer = std.fifo.LinearFifo(u8, .{ .Static = 4096 }); - var fifo = FifoBuffer.init(); - try fifo.pump(limited_reader.reader(), writer); + try limited_reader.reader().readRemaining(writer); } pub fn writeResourceData(writer: anytype, data_reader: anytype, data_size: u32) !void { diff --git a/lib/std/std.zig b/lib/std/std.zig index 7c18485ab9..73a29ed28e 100644 --- a/lib/std/std.zig +++ b/lib/std/std.zig @@ -58,7 +58,6 @@ pub const debug = @import("debug.zig"); pub const dwarf = @import("dwarf.zig"); pub const elf = @import("elf.zig"); pub const enums = @import("enums.zig"); -pub const fifo = @import("fifo.zig"); pub const fmt = @import("fmt.zig"); pub const fs = @import("fs.zig"); pub const gpu = @import("gpu.zig"); diff --git a/src/Compilation.zig b/src/Compilation.zig index bbcdc4b83a..7e650c4ab7 100644 --- a/src/Compilation.zig +++ b/src/Compilation.zig @@ -44,6 +44,8 @@ const Builtin = @import("Builtin.zig"); const LlvmObject = @import("codegen/llvm.zig").Object; const dev = @import("dev.zig"); +const DeprecatedLinearFifo = @import("deprecated.zig").LinearFifo; + pub const Config = @import("Compilation/Config.zig"); /// General-purpose allocator. Used for both temporary and long-term storage. @@ -121,15 +123,15 @@ work_queues: [ } break :len len; } -]std.fifo.LinearFifo(Job, .Dynamic), +]DeprecatedLinearFifo(Job), /// These jobs are to invoke the Clang compiler to create an object file, which /// gets linked with the Compilation. -c_object_work_queue: std.fifo.LinearFifo(*CObject, .Dynamic), +c_object_work_queue: DeprecatedLinearFifo(*CObject), /// These jobs are to invoke the RC compiler to create a compiled resource file (.res), which /// gets linked with the Compilation. -win32_resource_work_queue: if (dev.env.supports(.win32_resource)) std.fifo.LinearFifo(*Win32Resource, .Dynamic) else struct { +win32_resource_work_queue: if (dev.env.supports(.win32_resource)) DeprecatedLinearFifo(*Win32Resource) else struct { pub fn ensureUnusedCapacity(_: @This(), _: u0) error{}!void {} pub fn readItem(_: @This()) ?noreturn { return null; diff --git a/lib/std/fifo.zig b/src/deprecated.zig similarity index 100% rename from lib/std/fifo.zig rename to src/deprecated.zig diff --git a/src/link/MachO/dyld_info/Trie.zig b/src/link/MachO/dyld_info/Trie.zig index 59d765c432..53e73c334d 100644 --- a/src/link/MachO/dyld_info/Trie.zig +++ b/src/link/MachO/dyld_info/Trie.zig @@ -138,7 +138,7 @@ fn finalize(self: *Trie, allocator: Allocator) !void { defer ordered_nodes.deinit(); try ordered_nodes.ensureTotalCapacityPrecise(self.nodes.items(.is_terminal).len); - var fifo = std.fifo.LinearFifo(Node.Index, .Dynamic).init(allocator); + var fifo = DeprecatedLinearFifo(Node.Index).init(allocator); defer fifo.deinit(); try fifo.writeItem(self.root.?); @@ -409,6 +409,7 @@ const mem = std.mem; const std = @import("std"); const testing = std.testing; const trace = @import("../../../tracy.zig").trace; +const DeprecatedLinearFifo = @import("../../../deprecated.zig").LinearFifo; const Allocator = mem.Allocator; const MachO = @import("../../MachO.zig");