allocgate: renamed getAllocator function to allocator

9 files changed, 10 insertions, 15 deletions

diff --git a/tools/gen_spirv_spec.zig b/tools/gen_spirv_spec.zig
index e4ad6927b2..465404e5d1 100644
--- a/tools/gen_spirv_spec.zig
+++ b/tools/gen_spirv_spec.zig
@@ -4,7 +4,7 @@ const g = @import("spirv/grammar.zig");
 pub fn main() !void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
-    const allocator = arena.getAllocator();
+    const allocator = arena.allocator();
 
     const args = try std.process.argsAlloc(allocator);
     if (args.len != 2) {
diff --git a/tools/gen_stubs.zig b/tools/gen_stubs.zig
index a99d14752f..56ea7715a7 100644
--- a/tools/gen_stubs.zig
+++ b/tools/gen_stubs.zig
@@ -25,7 +25,7 @@ pub fn main() !void {
 
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
-    const ally = arena.getAllocator();
+    const ally = arena.allocator();
 
     var symbols = std.ArrayList(Symbol).init(ally);
     var sections = std.ArrayList([]const u8).init(ally);
diff --git a/tools/merge_anal_dumps.zig b/tools/merge_anal_dumps.zig
index 93e0674605..7c77e76a02 100644
--- a/tools/merge_anal_dumps.zig
+++ b/tools/merge_anal_dumps.zig
@@ -9,7 +9,7 @@ pub fn main() anyerror!void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
 
-    const allocator = arena.getAllocator();
+    const allocator = arena.allocator();
 
     const args = try std.process.argsAlloc(allocator);
 
diff --git a/tools/process_headers.zig b/tools/process_headers.zig
index 1a90f99343..fea50b30df 100644
--- a/tools/process_headers.zig
+++ b/tools/process_headers.zig
@@ -284,7 +284,7 @@ const LibCVendor = enum {
 
 pub fn main() !void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
-    const allocator = arena.getAllocator();
+    const allocator = arena.allocator();
     const args = try std.process.argsAlloc(allocator);
     var search_paths = std.ArrayList([]const u8).init(allocator);
     var opt_out_dir: ?[]const u8 = null;
diff --git a/tools/update-license-headers.zig b/tools/update-license-headers.zig
index 83c47f1481..4e415784f8 100644
--- a/tools/update-license-headers.zig
+++ b/tools/update-license-headers.zig
@@ -10,7 +10,7 @@ pub fn main() !void {
     defer root_node.end();
 
     var arena_allocator = std.heap.ArenaAllocator.init(std.heap.page_allocator);
-    const arena = arena_allocator.getAllocator();
+    const arena = arena_allocator.allocator();
 
     const args = try std.process.argsAlloc(arena);
     const path_to_walk = args[1];
diff --git a/tools/update_clang_options.zig b/tools/update_clang_options.zig
index 90a96e0572..7360f96560 100644
--- a/tools/update_clang_options.zig
+++ b/tools/update_clang_options.zig
@@ -450,13 +450,8 @@ const cpu_targets = struct {
 pub fn main() anyerror!void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
-<<<<<<< HEAD
-    const allocator = &arena.allocator;
 
-=======
-
-    const allocator = arena.getAllocator();
->>>>>>> 11157e318 (allocgate: stage 1 and 2 building)
+    const allocator = arena.allocator();
     const args = try std.process.argsAlloc(allocator);
 
     if (args.len <= 1) {
diff --git a/tools/update_cpu_features.zig b/tools/update_cpu_features.zig
index 70bc5a1c74..73c05d8cf1 100644
--- a/tools/update_cpu_features.zig
+++ b/tools/update_cpu_features.zig
@@ -769,7 +769,7 @@ const llvm_targets = [_]LlvmTarget{
 pub fn main() anyerror!void {
     var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena_state.deinit();
-    const arena = arena_state.getAllocator();
+    const arena = arena_state.allocator();
 
     const args = try std.process.argsAlloc(arena);
     if (args.len <= 1) {
@@ -845,7 +845,7 @@ fn processOneTarget(job: Job) anyerror!void {
 
     var arena_state = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena_state.deinit();
-    const arena = arena_state.getAllocator();
+    const arena = arena_state.allocator();
 
     var progress_node = job.root_progress.start(llvm_target.zig_name, 3);
     progress_node.activate();
diff --git a/tools/update_glibc.zig b/tools/update_glibc.zig
index 7cccb47e1c..e450f8c6d4 100644
--- a/tools/update_glibc.zig
+++ b/tools/update_glibc.zig
@@ -133,7 +133,7 @@ const Function = struct {
 
 pub fn main() !void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
-    const allocator = arena.getAllocator();
+    const allocator = arena.allocator();
     const args = try std.process.argsAlloc(allocator);
     const in_glibc_dir = args[1]; // path to the unzipped tarball of glibc, e.g. ~/downloads/glibc-2.25
     const zig_src_dir = args[2]; // path to the source checkout of zig, lib dir, e.g. ~/zig-src/lib
diff --git a/tools/update_spirv_features.zig b/tools/update_spirv_features.zig
index 0c6c570a31..8972ab641c 100644
--- a/tools/update_spirv_features.zig
+++ b/tools/update_spirv_features.zig
@@ -48,7 +48,7 @@ const Version = struct {
 pub fn main() !void {
     var arena = std.heap.ArenaAllocator.init(std.heap.page_allocator);
     defer arena.deinit();
-    const allocator = arena.getAllocator();
+    const allocator = arena.allocator();
 
     const args = try std.process.argsAlloc(allocator);