diff options
| author | Lee Cannon <leecannon@leecannon.xyz> | 2021-10-29 00:37:25 +0100 |
|---|---|---|
| committer | Lee Cannon <leecannon@leecannon.xyz> | 2021-11-30 23:32:47 +0000 |
| commit | 85de022c5671d777f62ddff254a814dab05242fc (patch) | |
| tree | 037f58c4b07d18b80cf48cf74d0f0e8c8866f8f2 /tools | |
| parent | 1e0addcf73ee71d23a41b744995848bcca38e8d3 (diff) | |
| download | zig-85de022c5671d777f62ddff254a814dab05242fc.tar.gz zig-85de022c5671d777f62ddff254a814dab05242fc.zip | |
allocgate: std Allocator interface refactor
Diffstat (limited to 'tools')
| -rw-r--r-- | tools/merge_anal_dumps.zig | 4 | ||||
| -rw-r--r-- | tools/update_cpu_features.zig | 6 | ||||
| -rw-r--r-- | tools/update_spirv_features.zig | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/tools/merge_anal_dumps.zig b/tools/merge_anal_dumps.zig index d778698685..648a76ebfb 100644 --- a/tools/merge_anal_dumps.zig +++ b/tools/merge_anal_dumps.zig @@ -160,7 +160,7 @@ const Dump = struct { const ErrorMap = std.HashMap(Error, usize, Error.hash, Error.eql, 80); const TypeMap = std.HashMap(Type, usize, Type.hash, Type.eql, 80); - fn init(allocator: *mem.Allocator) Dump { + fn init(allocator: mem.Allocator) Dump { return Dump{ .targets = std.ArrayList([]const u8).init(allocator), .file_list = std.ArrayList([]const u8).init(allocator), @@ -434,7 +434,7 @@ const Dump = struct { try jw.endObject(); } - fn a(self: Dump) *mem.Allocator { + fn a(self: Dump) mem.Allocator { return self.targets.allocator; } diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig index f4632d0017..2eccb0ee1b 100644 --- a/tools/update_cpu_features.zig +++ b/tools/update_cpu_features.zig @@ -1244,7 +1244,7 @@ fn asciiLessThan(context: void, a: []const u8, b: []const u8) bool { return std.ascii.lessThanIgnoreCase(a, b); } -fn llvmNameToZigName(arena: *mem.Allocator, llvm_name: []const u8) ![]const u8 { +fn llvmNameToZigName(arena: mem.Allocator, llvm_name: []const u8) ![]const u8 { const duped = try arena.dupe(u8, llvm_name); for (duped) |*byte| switch (byte.*) { '-', '.' => byte.* = '_', @@ -1254,7 +1254,7 @@ fn llvmNameToZigName(arena: *mem.Allocator, llvm_name: []const u8) ![]const u8 { } fn llvmNameToZigNameOmit( - arena: *mem.Allocator, + arena: mem.Allocator, llvm_target: LlvmTarget, llvm_name: []const u8, ) !?[]const u8 { @@ -1279,7 +1279,7 @@ fn hasSuperclass(obj: *json.ObjectMap, class_name: []const u8) bool { } fn pruneFeatures( - arena: *mem.Allocator, + arena: mem.Allocator, features_table: std.StringHashMap(Feature), deps_set: *std.StringHashMap(void), ) !void { diff --git a/tools/update_spirv_features.zig b/tools/update_spirv_features.zig index 69e8237f98..756d311ecc 100644 --- a/tools/update_spirv_features.zig +++ b/tools/update_spirv_features.zig @@ -216,7 +216,7 @@ pub fn main() !void { /// The *.grammar.json in SPIRV-Headers should have most of these as well, but with this we're sure to get only the actually /// registered ones. /// TODO: Unfortunately, neither repository contains a machine-readable list of extension dependencies. -fn gather_extensions(allocator: *Allocator, spirv_registry_root: []const u8) ![]const []const u8 { +fn gather_extensions(allocator: Allocator, spirv_registry_root: []const u8) ![]const []const u8 { const extensions_path = try fs.path.join(allocator, &.{ spirv_registry_root, "extensions" }); var extensions_dir = try fs.cwd().openDir(extensions_path, .{ .iterate = true }); defer extensions_dir.close(); @@ -286,7 +286,7 @@ fn insertVersion(versions: *std.ArrayList(Version), version: ?[]const u8) !void try versions.append(ver); } -fn gatherVersions(allocator: *Allocator, registry: g.CoreRegistry) ![]const Version { +fn gatherVersions(allocator: Allocator, registry: g.CoreRegistry) ![]const Version { // Expected number of versions is small var versions = std.ArrayList(Version).init(allocator); |
