From 8ca9452a82bbb8936fc983ac0ef699e2576f952c Mon Sep 17 00:00:00 2001
From: ominitay <37453713+ominitay@users.noreply.github.com>
Date: Wed, 22 Dec 2021 12:58:06 +0000
Subject: [PATCH] Remove deprecation warnings and enable test

Also fixes previously broken code uncovered by this
---
 lib/std/target.zig          |  3 ---
 lib/std/zig/parser_test.zig | 18 ------------------
 lib/std/zig/render.zig      |  7 +------
 3 files changed, 1 insertion(+), 27 deletions(-)

diff --git a/lib/std/target.zig b/lib/std/target.zig
index ca1f668ca4..5848bfeb6f 100644
--- a/lib/std/target.zig
+++ b/lib/std/target.zig
@@ -1318,9 +1318,6 @@ pub const Target = struct {
         }
     };
 
-    /// TODO delete this deprecated declaration after 0.9.0 is released
-    pub const current = @compileError("instead of std.Target.current, use @import(\"builtin\").target");
-
     pub const stack_align = 16;
 
     pub fn zigTriple(self: Target, allocator: mem.Allocator) ![]u8 {
diff --git a/lib/std/zig/parser_test.zig b/lib/std/zig/parser_test.zig
index 066e12e558..14b0e8b501 100644
--- a/lib/std/zig/parser_test.zig
+++ b/lib/std/zig/parser_test.zig
@@ -72,21 +72,6 @@ test "zig fmt: rewrite callconv(.Inline) to the inline keyword" {
     );
 }
 
-// TODO Remove this after zig 0.9.0 is released.
-test "zig fmt: rewrite @byteOffsetOf to @offsetOf" {
-    try testTransform(
-        \\fn foo() void {
-        \\    @byteOffsetOf(Foo, "bar");
-        \\}
-        \\
-    ,
-        \\fn foo() void {
-        \\    @offsetOf(Foo, "bar");
-        \\}
-        \\
-    );
-}
-
 // TODO Remove this after zig 0.10.0 is released.
 test "zig fmt: rewrite c_void to anyopaque" {
     try testTransform(
@@ -5270,9 +5255,6 @@ test "recovery: invalid comptime" {
 }
 
 test "recovery: missing block after suspend" {
-    // TODO Enable this after zig 0.9.0 is released.
-    if (true) return error.SkipZigTest;
-
     try testError(
         \\fn foo() void {
         \\    suspend;
diff --git a/lib/std/zig/render.zig b/lib/std/zig/render.zig
index 93c9099b2e..de33f380f8 100644
--- a/lib/std/zig/render.zig
+++ b/lib/std/zig/render.zig
@@ -1238,12 +1238,7 @@ fn renderBuiltinCall(
 ) Error!void {
     const token_tags = tree.tokens.items(.tag);
 
-    const builtin_name = tokenSliceForRender(tree, builtin_token);
-    if (mem.eql(u8, builtin_name, "@byteOffsetOf")) {
-        try ais.writer().writeAll("@offsetOf");
-    } else {
-        try renderToken(ais, tree, builtin_token, .none); // @name
-    }
+    try renderToken(ais, tree, builtin_token, .none); // @name
 
     if (params.len == 0) {
         try renderToken(ais, tree, builtin_token + 1, .none); // (