Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion doc/langref/test_switch_dispatch_loop.zig
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ const Instruction = enum {

fn evaluate(initial_stack: []const i32, code: []const Instruction) !i32 {
var buffer: [8]i32 = undefined;
var stack = std.ArrayListUnmanaged(i32).initBuffer(&buffer);
var stack = std.ArrayList(i32).initBuffer(&buffer);
try stack.appendSliceBounded(initial_stack);
var ip: usize = 0;

Expand Down
18 changes: 9 additions & 9 deletions lib/build-web/fuzz.zig
Original file line number Diff line number Diff line change
Expand Up @@ -42,7 +42,7 @@ pub fn sourceIndexMessage(msg_bytes: []u8) error{OutOfMemory}!void {

var coverage = Coverage.init;
/// Index of type `SourceLocationIndex`.
var coverage_source_locations: std.ArrayListUnmanaged(Coverage.SourceLocation) = .empty;
var coverage_source_locations: std.ArrayList(Coverage.SourceLocation) = .empty;
/// Contains the most recent coverage update message, unmodified.
var recent_coverage_update: std.ArrayListAlignedUnmanaged(u8, .of(u64)) = .empty;

Expand Down Expand Up @@ -76,7 +76,7 @@ pub fn coverageUpdateMessage(msg_bytes: []u8) error{OutOfMemory}!void {
try updateCoverage();
}

var entry_points: std.ArrayListUnmanaged(SourceLocationIndex) = .empty;
var entry_points: std.ArrayList(SourceLocationIndex) = .empty;

pub fn entryPointsMessage(msg_bytes: []u8) error{OutOfMemory}!void {
const header: abi.fuzz.EntryPointHeader = @bitCast(msg_bytes[0..@sizeOf(abi.fuzz.EntryPointHeader)].*);
Expand Down Expand Up @@ -127,19 +127,19 @@ const SourceLocationIndex = enum(u32) {
}

fn toWalkFile(sli: SourceLocationIndex) ?Walk.File.Index {
var buf: std.ArrayListUnmanaged(u8) = .empty;
var buf: std.ArrayList(u8) = .empty;
defer buf.deinit(gpa);
sli.appendPath(&buf) catch @panic("OOM");
return @enumFromInt(Walk.files.getIndex(buf.items) orelse return null);
}

fn fileHtml(
sli: SourceLocationIndex,
out: *std.ArrayListUnmanaged(u8),
out: *std.ArrayList(u8),
) error{ OutOfMemory, SourceUnavailable }!void {
const walk_file_index = sli.toWalkFile() orelse return error.SourceUnavailable;
const root_node = walk_file_index.findRootDecl().get().ast_node;
var annotations: std.ArrayListUnmanaged(html_render.Annotation) = .empty;
var annotations: std.ArrayList(html_render.Annotation) = .empty;
defer annotations.deinit(gpa);
try computeSourceAnnotations(sli.ptr().file, walk_file_index, &annotations, coverage_source_locations.items);
html_render.fileSourceHtml(walk_file_index, out, root_node, .{
Expand All @@ -153,13 +153,13 @@ const SourceLocationIndex = enum(u32) {
fn computeSourceAnnotations(
cov_file_index: Coverage.File.Index,
walk_file_index: Walk.File.Index,
annotations: *std.ArrayListUnmanaged(html_render.Annotation),
annotations: *std.ArrayList(html_render.Annotation),
source_locations: []const Coverage.SourceLocation,
) !void {
// Collect all the source locations from only this file into this array
// first, then sort by line, col, so that we can collect annotations with
// O(N) time complexity.
var locs: std.ArrayListUnmanaged(SourceLocationIndex) = .empty;
var locs: std.ArrayList(SourceLocationIndex) = .empty;
defer locs.deinit(gpa);

for (source_locations, 0..) |sl, sli_usize| {
Expand Down Expand Up @@ -308,7 +308,7 @@ fn updateCoverage() error{OutOfMemory}!void {
if (recent_coverage_update.items.len == 0) return;
const want_file = (selected_source_location orelse return).ptr().file;

var covered: std.ArrayListUnmanaged(SourceLocationIndex) = .empty;
var covered: std.ArrayList(SourceLocationIndex) = .empty;
defer covered.deinit(gpa);

// This code assumes 64-bit elements, which is incorrect if the executable
Expand Down Expand Up @@ -339,7 +339,7 @@ fn updateCoverage() error{OutOfMemory}!void {
fn updateSource() error{OutOfMemory}!void {
if (recent_coverage_update.items.len == 0) return;
const file_sli = selected_source_location.?;
var html: std.ArrayListUnmanaged(u8) = .empty;
var html: std.ArrayList(u8) = .empty;
defer html.deinit(gpa);
file_sli.fileHtml(&html) catch |err| switch (err) {
error.OutOfMemory => |e| return e,
Expand Down
2 changes: 1 addition & 1 deletion lib/build-web/time_report.zig
Original file line number Diff line number Diff line change
Expand Up @@ -254,7 +254,7 @@ pub fn runTestResultMessage(msg_bytes: []u8) error{OutOfMemory}!void {
const durations: []align(1) const u64 = @ptrCast(trailing[0 .. hdr.tests_len * 8]);
var offset: usize = hdr.tests_len * 8;

var table_html: std.ArrayListUnmanaged(u8) = .empty;
var table_html: std.ArrayList(u8) = .empty;
defer table_html.deinit(gpa);

for (durations) |test_ns| {
Expand Down
6 changes: 3 additions & 3 deletions lib/compiler/build_runner.zig
Original file line number Diff line number Diff line change
Expand Up @@ -459,7 +459,7 @@ pub fn main() !void {
}

if (graph.needed_lazy_dependencies.entries.len != 0) {
var buffer: std.ArrayListUnmanaged(u8) = .empty;
var buffer: std.ArrayList(u8) = .empty;
for (graph.needed_lazy_dependencies.keys()) |k| {
try buffer.appendSlice(arena, k);
try buffer.append(arena, '\n');
Expand Down Expand Up @@ -672,7 +672,7 @@ const Run = struct {
watch: bool,
web_server: if (!builtin.single_threaded) ?WebServer else ?noreturn,
/// Allocated into `gpa`.
memory_blocked_steps: std.ArrayListUnmanaged(*Step),
memory_blocked_steps: std.ArrayList(*Step),
/// Allocated into `gpa`.
step_stack: std.AutoArrayHashMapUnmanaged(*Step, void),
thread_pool: std.Thread.Pool,
Expand Down Expand Up @@ -1468,7 +1468,7 @@ pub fn printErrorMessages(
if (error_style.verboseContext()) {
// Provide context for where these error messages are coming from by
// printing the corresponding Step subtree.
var step_stack: std.ArrayListUnmanaged(*Step) = .empty;
var step_stack: std.ArrayList(*Step) = .empty;
defer step_stack.deinit(gpa);
try step_stack.append(gpa, failing_step);
while (step_stack.items[step_stack.items.len - 1].dependants.items.len != 0) {
Expand Down
4 changes: 2 additions & 2 deletions lib/compiler/objcopy.zig
Original file line number Diff line number Diff line change
Expand Up @@ -381,8 +381,8 @@ const BinaryElfSegment = struct {
};

const BinaryElfOutput = struct {
segments: std.ArrayListUnmanaged(*BinaryElfSegment),
sections: std.ArrayListUnmanaged(*BinaryElfSection),
segments: std.ArrayList(*BinaryElfSegment),
sections: std.ArrayList(*BinaryElfSection),
allocator: Allocator,
shstrtab: ?[]const u8,

Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/reduce.zig
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ pub fn main() !void {
const root_source_file_path = opt_root_source_file_path orelse
fatal("missing root source file path argument; see -h for usage", .{});

var interestingness_argv: std.ArrayListUnmanaged([]const u8) = .empty;
var interestingness_argv: std.ArrayList([]const u8) = .empty;
try interestingness_argv.ensureUnusedCapacity(arena, argv.len + 1);
interestingness_argv.appendAssumeCapacity(checker_path);
interestingness_argv.appendSliceAssumeCapacity(argv);
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/reduce/Walk.zig
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ pub const Transformation = union(enum) {
delete_var_decl: struct {
var_decl_node: Ast.Node.Index,
/// Identifier nodes that reference the variable.
references: std.ArrayListUnmanaged(Ast.Node.Index),
references: std.ArrayList(Ast.Node.Index),
},
/// Replace an expression with `undefined`.
replace_with_undef: Ast.Node.Index,
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/std-docs.zig
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ fn buildWasmBinary(
) !Cache.Path {
const gpa = context.gpa;

var argv: std.ArrayListUnmanaged([]const u8) = .empty;
var argv: std.ArrayList([]const u8) = .empty;

try argv.appendSlice(arena, &.{
context.zig_exe_path, //
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/test_runner.zig
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ fn mainServer() !void {
@panic("internal test runner memory leak");
};

var string_bytes: std.ArrayListUnmanaged(u8) = .empty;
var string_bytes: std.ArrayList(u8) = .empty;
defer string_bytes.deinit(testing.allocator);
try string_bytes.append(testing.allocator, 0); // Reserve 0 for null.

Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/translate-c/MacroTranslator.zig
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ fn parseCNumLit(mt: *MacroTranslator) ParseError!ZigNode {
const lit_bytes = mt.tokSlice();
mt.i += 1;

var bytes = try std.ArrayListUnmanaged(u8).initCapacity(arena, lit_bytes.len + 3);
var bytes = try std.ArrayList(u8).initCapacity(arena, lit_bytes.len + 3);

const prefix = aro.Tree.Token.NumberPrefix.fromString(lit_bytes);
switch (prefix) {
Expand Down
8 changes: 4 additions & 4 deletions lib/compiler/translate-c/Scope.zig
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,15 @@ const Translator = @import("Translator.zig");
const Scope = @This();

pub const SymbolTable = std.StringArrayHashMapUnmanaged(ast.Node);
pub const AliasList = std.ArrayListUnmanaged(struct {
pub const AliasList = std.ArrayList(struct {
alias: []const u8,
name: []const u8,
});

/// Associates a container (structure or union) with its relevant member functions.
pub const ContainerMemberFns = struct {
container_decl_ptr: *ast.Node,
member_fns: std.ArrayListUnmanaged(*ast.Payload.Func) = .empty,
member_fns: std.ArrayList(*ast.Payload.Func) = .empty,
};
pub const ContainerMemberFnsHashMap = std.AutoArrayHashMapUnmanaged(aro.QualType, ContainerMemberFns);

Expand Down Expand Up @@ -55,7 +55,7 @@ pub const Condition = struct {
pub const Block = struct {
base: Scope,
translator: *Translator,
statements: std.ArrayListUnmanaged(ast.Node),
statements: std.ArrayList(ast.Node),
variables: AliasList,
mangle_count: u32 = 0,
label: ?[]const u8 = null,
Expand Down Expand Up @@ -195,7 +195,7 @@ pub const Root = struct {
translator: *Translator,
sym_table: SymbolTable,
blank_macros: std.StringArrayHashMapUnmanaged(void),
nodes: std.ArrayListUnmanaged(ast.Node),
nodes: std.ArrayList(ast.Node),
container_member_fns_map: ContainerMemberFnsHashMap,

pub fn init(t: *Translator) Root {
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/translate-c/Translator.zig
Original file line number Diff line number Diff line change
Expand Up @@ -3551,7 +3551,7 @@ fn transArrayInit(
const array_item_qt = array_init.container_qt.childType(t.comp);
const array_item_type = try t.transType(scope, array_item_qt, array_init.l_brace_tok);
var maybe_lhs: ?ZigNode = null;
var val_list: std.ArrayListUnmanaged(ZigNode) = .empty;
var val_list: std.ArrayList(ZigNode) = .empty;
defer val_list.deinit(t.gpa);
var i: usize = 0;
while (i < array_init.items.len) {
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/translate-c/ast.zig
Original file line number Diff line number Diff line change
Expand Up @@ -860,7 +860,7 @@ const Context = struct {
gpa: Allocator,
buf: std.ArrayList(u8) = .empty,
nodes: std.zig.Ast.NodeList = .empty,
extra_data: std.ArrayListUnmanaged(u32) = .empty,
extra_data: std.ArrayList(u32) = .empty,
tokens: std.zig.Ast.TokenList = .empty,

fn addTokenFmt(c: *Context, tag: TokenTag, comptime format: []const u8, args: anytype) Allocator.Error!TokenIndex {
Expand Down
2 changes: 1 addition & 1 deletion lib/compiler/translate-c/main.zig
Original file line number Diff line number Diff line change
Expand Up @@ -149,7 +149,7 @@ fn translate(d: *aro.Driver, tc: *aro.Toolchain, args: [][:0]u8, zig_integration
break :args args[0..i];
};
const user_macros = macros: {
var macro_buf: std.ArrayListUnmanaged(u8) = .empty;
var macro_buf: std.ArrayList(u8) = .empty;
defer macro_buf.deinit(gpa);

var discard_buf: [256]u8 = undefined;
Expand Down
2 changes: 1 addition & 1 deletion lib/docs/wasm/Walk.zig
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ const Oom = error{OutOfMemory};
pub const Decl = @import("Decl.zig");

pub var files: std.StringArrayHashMapUnmanaged(File) = .empty;
pub var decls: std.ArrayListUnmanaged(Decl) = .empty;
pub var decls: std.ArrayList(Decl) = .empty;
pub var modules: std.StringArrayHashMapUnmanaged(File.Index) = .empty;

file: File.Index,
Expand Down
2 changes: 1 addition & 1 deletion lib/docs/wasm/markdown/Parser.zig
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ const Node = Document.Node;
const ExtraIndex = Document.ExtraIndex;
const ExtraData = Document.ExtraData;
const StringIndex = Document.StringIndex;
const ArrayList = std.ArrayListUnmanaged;
const ArrayList = std.ArrayList;

nodes: Node.List = .{},
extra: ArrayList(u32) = .empty,
Expand Down
14 changes: 7 additions & 7 deletions lib/fuzzer.zig
Original file line number Diff line number Diff line change
Expand Up @@ -266,10 +266,10 @@ const Instrumentation = struct {
/// Values that have been constant operands in comparisons and switch cases.
/// There may be duplicates in this array if they came from different addresses, which is
/// fine as they are likely more important and hence more likely to be selected.
const_vals2: std.ArrayListUnmanaged(u16) = .empty,
const_vals4: std.ArrayListUnmanaged(u32) = .empty,
const_vals8: std.ArrayListUnmanaged(u64) = .empty,
const_vals16: std.ArrayListUnmanaged(u128) = .empty,
const_vals2: std.ArrayList(u16) = .empty,
const_vals4: std.ArrayList(u32) = .empty,
const_vals8: std.ArrayList(u64) = .empty,
const_vals16: std.ArrayList(u128) = .empty,

/// A minimal state for this struct which instrumentation can function on.
/// Used before this structure is initialized to avoid illegal behavior
Expand Down Expand Up @@ -370,11 +370,11 @@ const Fuzzer = struct {
/// Minimized past inputs leading to new pc hits.
/// These are randomly mutated in round-robin fashion
/// Element zero is always an empty input. It is gauraunteed no other elements are empty.
corpus: std.ArrayListUnmanaged([]const u8),
corpus: std.ArrayList([]const u8),
corpus_pos: usize,
/// List of past mutations that have led to new inputs. This way, the mutations that are the
/// most effective are the most likely to be selected again. Starts with one of each mutation.
mutations: std.ArrayListUnmanaged(Mutation) = .empty,
mutations: std.ArrayList(Mutation) = .empty,

/// Filesystem directory containing found inputs for future runs
corpus_dir: std.fs.Dir,
Expand Down Expand Up @@ -1286,7 +1286,7 @@ const Mutation = enum {
}
};

/// Like `std.ArrayListUnmanaged(u8)` but backed by memory mapping.
/// Like `std.ArrayList(u8)` but backed by memory mapping.
pub const MemoryMappedList = struct {
/// Contents of the list.
///
Expand Down
6 changes: 3 additions & 3 deletions lib/std/Build/Cache.zig
Original file line number Diff line number Diff line change
Expand Up @@ -1063,10 +1063,10 @@ pub const Manifest = struct {
const dep_file_contents = try dir.readFileAlloc(dep_file_sub_path, gpa, .limited(manifest_file_size_max));
defer gpa.free(dep_file_contents);

var error_buf: std.ArrayListUnmanaged(u8) = .empty;
var error_buf: std.ArrayList(u8) = .empty;
defer error_buf.deinit(gpa);

var resolve_buf: std.ArrayListUnmanaged(u8) = .empty;
var resolve_buf: std.ArrayList(u8) = .empty;
defer resolve_buf.deinit(gpa);

var it: DepTokenizer = .{ .bytes = dep_file_contents };
Expand Down Expand Up @@ -1217,7 +1217,7 @@ pub const Manifest = struct {
self.files.deinit(self.cache.gpa);
}

pub fn populateFileSystemInputs(man: *Manifest, buf: *std.ArrayListUnmanaged(u8)) Allocator.Error!void {
pub fn populateFileSystemInputs(man: *Manifest, buf: *std.ArrayList(u8)) Allocator.Error!void {
assert(@typeInfo(std.zig.Server.Message.PathPrefix).@"enum".fields.len == man.cache.prefixes_len);
buf.clearRetainingCapacity();
const gpa = man.cache.gpa;
Expand Down
12 changes: 6 additions & 6 deletions lib/std/Build/Cache/DepTokenizer.zig
Original file line number Diff line number Diff line change
Expand Up @@ -363,7 +363,7 @@ pub const Token = union(enum) {
};

/// Resolve escapes in target or prereq. Only valid with .target_must_resolve or .prereq_must_resolve.
pub fn resolve(self: Token, gpa: Allocator, list: *std.ArrayListUnmanaged(u8)) error{OutOfMemory}!void {
pub fn resolve(self: Token, gpa: Allocator, list: *std.ArrayList(u8)) error{OutOfMemory}!void {
switch (self) {
.target_must_resolve => |bytes| {
var state: enum { start, escape, dollar } = .start;
Expand Down Expand Up @@ -429,7 +429,7 @@ pub const Token = union(enum) {
}
}

pub fn printError(self: Token, gpa: Allocator, list: *std.ArrayListUnmanaged(u8)) error{OutOfMemory}!void {
pub fn printError(self: Token, gpa: Allocator, list: *std.ArrayList(u8)) error{OutOfMemory}!void {
switch (self) {
.target, .target_must_resolve, .prereq, .prereq_must_resolve => unreachable, // not an error
.incomplete_quoted_prerequisite,
Expand Down Expand Up @@ -1027,8 +1027,8 @@ fn depTokenizer(input: []const u8, expect: []const u8) !void {
defer arena_allocator.deinit();

var it: Tokenizer = .{ .bytes = input };
var buffer: std.ArrayListUnmanaged(u8) = .empty;
var resolve_buf: std.ArrayListUnmanaged(u8) = .empty;
var buffer: std.ArrayList(u8) = .empty;
var resolve_buf: std.ArrayList(u8) = .empty;
var i: usize = 0;
while (it.next()) |token| {
if (i != 0) try buffer.appendSlice(arena, "\n");
Expand Down Expand Up @@ -1076,11 +1076,11 @@ fn depTokenizer(input: []const u8, expect: []const u8) !void {
try testing.expectEqualStrings(expect, buffer.items);
}

fn printCharValues(gpa: Allocator, list: *std.ArrayListUnmanaged(u8), bytes: []const u8) !void {
fn printCharValues(gpa: Allocator, list: *std.ArrayList(u8), bytes: []const u8) !void {
for (bytes) |b| try list.append(gpa, printable_char_tab[b]);
}

fn printUnderstandableChar(gpa: Allocator, list: *std.ArrayListUnmanaged(u8), char: u8) !void {
fn printUnderstandableChar(gpa: Allocator, list: *std.ArrayList(u8), char: u8) !void {
if (std.ascii.isPrint(char)) {
try list.print(gpa, "'{c}'", .{char});
} else {
Expand Down
6 changes: 3 additions & 3 deletions lib/std/Build/Fuzz.zig
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ coverage_files: std.AutoArrayHashMapUnmanaged(u64, CoverageMap),

queue_mutex: std.Thread.Mutex,
queue_cond: std.Thread.Condition,
msg_queue: std.ArrayListUnmanaged(Msg),
msg_queue: std.ArrayList(Msg),

pub const Mode = union(enum) {
forever: struct { ws: *Build.WebServer },
Expand Down Expand Up @@ -65,7 +65,7 @@ const CoverageMap = struct {
coverage: Coverage,
source_locations: []Coverage.SourceLocation,
/// Elements are indexes into `source_locations` pointing to the unit tests that are being fuzz tested.
entry_points: std.ArrayListUnmanaged(u32),
entry_points: std.ArrayList(u32),
start_timestamp: i64,

fn deinit(cm: *CoverageMap, gpa: Allocator) void {
Expand All @@ -85,7 +85,7 @@ pub fn init(
mode: Mode,
) Allocator.Error!Fuzz {
const run_steps: []const *Step.Run = steps: {
var steps: std.ArrayListUnmanaged(*Step.Run) = .empty;
var steps: std.ArrayList(*Step.Run) = .empty;
defer steps.deinit(gpa);
const rebuild_node = root_prog_node.start("Rebuilding Unit Tests", 0);
defer rebuild_node.end();
Expand Down
Loading