From f9e26d98711ead110a4c2d2f3032978a5a8c2d9d Mon Sep 17 00:00:00 2001
From: Carter Sande <carter.sande@duodecima.technology>
Date: Tue, 25 Jun 2019 22:54:10 -0700
Subject: [PATCH] compiler-rt: use more idiomatic switch syntax

---
 std/special/compiler_rt.zig | 22 ++++++++--------------
 1 file changed, 8 insertions(+), 14 deletions(-)

diff --git a/std/special/compiler_rt.zig b/std/special/compiler_rt.zig
index 95867d6952..914f9dcb00 100644
--- a/std/special/compiler_rt.zig
+++ b/std/special/compiler_rt.zig
@@ -405,15 +405,15 @@ const use_thumb_1 = usesThumb1(builtin.arch);
 
 fn usesThumb1(arch: builtin.Arch) bool {
     return switch (arch) {
-        .arm => switch (arch.arm) {
+        .arm => |sub_arch| switch (sub_arch) {
             .v6m => true,
             else => false,
         },
-        .armeb => switch (arch.armeb) {
+        .armeb => |sub_arch| switch (sub_arch) {
             .v6m => true,
             else => false,
         },
-        .thumb => switch (arch.thumb) {
+        .thumb => |sub_arch| switch (sub_arch) {
             .v5,
             .v5te,
             .v4t,
@@ -423,7 +423,7 @@ fn usesThumb1(arch: builtin.Arch) bool {
             => true,
             else => false,
         },
-        .thumbeb => switch (arch.thumbeb) {
+        .thumbeb => |sub_arch| switch (sub_arch) {
             .v5,
             .v5te,
             .v4t,
@@ -475,18 +475,12 @@ const use_thumb_1_pre_armv6 = usesThumb1PreArmv6(builtin.arch);
 
 fn usesThumb1PreArmv6(arch: builtin.Arch) bool {
     return switch (arch) {
-        .thumb => switch (arch.thumb) {
-            .v5,
-            .v5te,
-            .v4t,
-            => true,
+        .thumb => |sub_arch| switch (sub_arch) {
+            .v5, .v5te, .v4t => true,
             else => false,
         },
-        .thumbeb => switch (arch.thumbeb) {
-            .v5,
-            .v5te,
-            .v4t,
-            => true,
+        .thumbeb => |sub_arch| switch (sub_arch) {
+            .v5, .v5te, .v4t => true,
             else => false,
         },
         else => false,