From 474ade88b58b6fd7239049ec445129eabafa3cbd Mon Sep 17 00:00:00 2001
From: Andrew Kelley <andrew@ziglang.org>
Date: Thu, 29 Apr 2021 20:33:29 -0700
Subject: [PATCH] std: fix compile errors found by stage2 AstGen

---
 lib/std/c/ast.zig      | 3 ---
 lib/std/c/haiku.zig    | 2 +-
 lib/std/c/parse.zig    | 8 ++++----
 lib/std/meta.zig       | 8 ++------
 lib/std/meta/trait.zig | 4 ++--
 5 files changed, 9 insertions(+), 16 deletions(-)

diff --git a/lib/std/c/ast.zig b/lib/std/c/ast.zig
index 71455c0ea3e3bb65e93b2043d8e0a8b611308a58..92c7da838ef17805d7e73da35289e90d6536ef4e 100644
--- a/lib/std/c/ast.zig
+++ b/lib/std/c/ast.zig
@@ -673,9 +673,6 @@ pub const Expr = struct {
         base: Expr = Expr{ .id = .Infix },
         lhs: *Expr,
         op_token: TokenIndex,
-        op: Op,
         rhs: *Expr,
-
-        pub const Op = enum {};
     };
 };
diff --git a/lib/std/c/haiku.zig b/lib/std/c/haiku.zig
index 1aa3ac31e2a13434409cc59f2531ebb075f62821..fcf99db57158126b13da0b84d90d59456431e452 100644
--- a/lib/std/c/haiku.zig
+++ b/lib/std/c/haiku.zig
@@ -70,7 +70,7 @@ pub const pthread_rwlock_t = extern struct {
     waiters: [2]?*c_void = [_]?*c_void{ null, null },
 };
 
-pub const EAI = extern enum(c_int) {
+pub const EAI = enum(c_int) {
     /// address family for hostname not supported
     ADDRFAMILY = 1,
 
diff --git a/lib/std/c/parse.zig b/lib/std/c/parse.zig
index 29d4ba2fe1fd86ff14d9345298039fee465505e6..49d2a3acd2999de5066b383df335cc6bf7b5c891 100644
--- a/lib/std/c/parse.zig
+++ b/lib/std/c/parse.zig
@@ -617,18 +617,18 @@ const Parser = struct {
                     return false;
                 };
                 switch (ty.id) {
-                    .Enum => |e| blk: {
+                    .Enum => |e| inner: {
                         if (e.name) |some|
                             if (!parser.tree.tokenEql(some, tok))
-                                break :blk;
+                                break :inner;
                         return parser.err(.{
                             .MustUseKwToRefer = .{ .kw = e.tok, .name = tok },
                         });
                     },
-                    .Record => |r| blk: {
+                    .Record => |r| inner: {
                         if (r.name) |some|
                             if (!parser.tree.tokenEql(some, tok))
-                                break :blk;
+                                break :inner;
                         return parser.err(.{
                             .MustUseKwToRefer = .{
                                 .kw = r.tok,
diff --git a/lib/std/meta.zig b/lib/std/meta.zig
index a09ddd730701778ced7f14da90f45fbfa0168132..2f9c7ccd96f7f6c2637e3cb3e54abe1897ed4bff 100644
--- a/lib/std/meta.zig
+++ b/lib/std/meta.zig
@@ -348,9 +348,6 @@ test "std.meta.containerLayout" {
     const E1 = enum {
         A,
     };
-    const E3 = extern enum {
-        A,
-    };
     const S1 = struct {};
     const S2 = packed struct {};
     const S3 = extern struct {};
@@ -365,7 +362,6 @@ test "std.meta.containerLayout" {
     };
 
     testing.expect(containerLayout(E1) == .Auto);
-    testing.expect(containerLayout(E3) == .Extern);
     testing.expect(containerLayout(S1) == .Auto);
     testing.expect(containerLayout(S2) == .Packed);
     testing.expect(containerLayout(S3) == .Extern);
@@ -1026,7 +1022,7 @@ test "std.meta.cast" {
 
     testing.expectEqual(@intToPtr(?*c_void, 2), cast(?*c_void, @intToPtr(*u8, 2)));
 
-    const C_ENUM = extern enum(c_int) {
+    const C_ENUM = enum(c_int) {
         A = 0,
         B,
         C,
@@ -1109,7 +1105,7 @@ pub fn sizeof(target: anytype) usize {
 }
 
 test "sizeof" {
-    const E = extern enum(c_int) { One, _ };
+    const E = enum(c_int) { One, _ };
     const S = extern struct { a: u32 };
 
     const ptr_size = @sizeOf(*c_void);
diff --git a/lib/std/meta/trait.zig b/lib/std/meta/trait.zig
index 481bfe212b3415ce97d1a938016b9f5412f84945..d9eb886c10b82cd553aef0225f2792bf63c12442 100644
--- a/lib/std/meta/trait.zig
+++ b/lib/std/meta/trait.zig
@@ -497,8 +497,8 @@ pub fn hasDecls(comptime T: type, comptime names: anytype) bool {
 test "std.meta.trait.hasDecls" {
     const TestStruct1 = struct {};
     const TestStruct2 = struct {
-        pub var a: u32;
-        pub var b: u32;
+        pub var a: u32 = undefined;
+        pub var b: u32 = undefined;
         c: bool,
         pub fn useless() void {}
     };
-- 
2.54.0