Deduplicate Arch ARM handling with a macro

Author: stunes-ms

flowey/flowey/src/lib.rs

@@ -14,6 +14,7 @@
 pub mod node {
     pub mod prelude {
         // include all user-facing types in the prelude
+        pub use flowey_core::match_arch;
         pub use flowey_core::node::user_facing::*;
 
         // ...in addition, export various types/traits that node impls are

flowey/flowey_core/src/node.rs

@@ -103,6 +103,20 @@ pub mod user_facing {
 
         Ok(())
     }
+
+    /// Helper method to handle Linux distros that are supported only on one
+    /// host architecture.
+    /// match_arch!(var, arch, result)
+    #[macro_export]
+    macro_rules! match_arch {
+        ($host_arch:expr, $match_arch:pat, $expr:expr) => {
+            if matches!($host_arch, $match_arch) {
+                $expr
+            } else {
+                anyhow::bail!("Linux distro not supported on host arch {}", $host_arch);
+            }
+        };
+    }
 }
 
 /// Check if `ReadVar` / `WriteVar` instances are backed by the same underlying

flowey/flowey_lib_hvlite/src/init_cross_build.rs

@@ -63,15 +63,9 @@ impl FlowNode for Node {
                                     let pkg = match linux_distribution {
                                         FlowPlatformLinuxDistro::Fedora => "gcc-x86_64-linux-gnu",
                                         FlowPlatformLinuxDistro::Ubuntu => "gcc-x86-64-linux-gnu",
-                                        FlowPlatformLinuxDistro::Arch => match host_arch {
-                                            FlowArch::X86_64 => "gcc",
-                                            FlowArch::Aarch64 => {
-                                                anyhow::bail!("Arch Linux ARM is not supported")
-                                            }
-                                            _ => {
-                                                anyhow::bail!("Unknown host arch")
-                                            }
-                                        },
+                                        FlowPlatformLinuxDistro::Arch => {
+                                            match_arch!(host_arch, FlowArch::X86_64, "gcc")
+                                        }
                                         FlowPlatformLinuxDistro::Unknown => {
                                             anyhow::bail!("Unknown Linux distribution")
                                         }
@@ -87,15 +81,11 @@ impl FlowNode for Node {
                                         | FlowPlatformLinuxDistro::Ubuntu => {
                                             "gcc-aarch64-linux-gnu"
                                         }
-                                        FlowPlatformLinuxDistro::Arch => match host_arch {
-                                            FlowArch::X86_64 => "aarch64-linux-gnu-gcc",
-                                            FlowArch::Aarch64 => {
-                                                anyhow::bail!("Arch Linux ARM is not supported")
-                                            }
-                                            _ => {
-                                                anyhow::bail!("Unknown host arch")
-                                            }
-                                        },
+                                        FlowPlatformLinuxDistro::Arch => match_arch!(
+                                            host_arch,
+                                            FlowArch::X86_64,
+                                            "aarch64-linux-gnu-gcc"
+                                        ),
                                         FlowPlatformLinuxDistro::Unknown => {
                                             anyhow::bail!("Unknown Linux distribution")
                                         }

flowey/flowey_lib_hvlite/src/run_split_debug_info.rs

@@ -43,15 +43,9 @@ impl SimpleFlowNode for Node {
                     FlowPlatformLinuxDistro::Ubuntu => {
                         ("binutils-x86-64-linux-gnu", "x86_64-linux-gnu-objcopy")
                     }
-                    FlowPlatformLinuxDistro::Arch => match host_arch {
-                        FlowArch::X86_64 => ("binutils", "objcopy"),
-                        FlowArch::Aarch64 => {
-                            anyhow::bail!("Arch Linux ARM is not supported")
-                        }
-                        _ => {
-                            anyhow::bail!("Unknown host arch")
-                        }
-                    },
+                    FlowPlatformLinuxDistro::Arch => {
+                        match_arch!(host_arch, FlowArch::X86_64, ("binutils", "objcopy"))
+                    }
                     FlowPlatformLinuxDistro::Unknown => anyhow::bail!("Unknown Linux distribution"),
                 },
                 _ => anyhow::bail!("Unsupported platform"),
@@ -62,15 +56,9 @@ impl SimpleFlowNode for Node {
                         FlowPlatformLinuxDistro::Fedora | FlowPlatformLinuxDistro::Ubuntu => {
                             "binutils-aarch64-linux-gnu"
                         }
-                        FlowPlatformLinuxDistro::Arch => match host_arch {
-                            FlowArch::X86_64 => "aarch64-linux-gnu-binutils",
-                            FlowArch::Aarch64 => {
-                                anyhow::bail!("Arch Linux ARM is not supported")
-                            }
-                            _ => {
-                                anyhow::bail!("Unknown host arch")
-                            }
-                        },
+                        FlowPlatformLinuxDistro::Arch => {
+                            match_arch!(host_arch, FlowArch::X86_64, "aarch64-linux-gnu-binutils")
+                        }
                         FlowPlatformLinuxDistro::Unknown => {
                             anyhow::bail!("Unknown Linux distribution")
                         }