Follow Maturin

Author: charliermarsh

crates/uv-distribution-types/src/prioritized_distribution.rs

@@ -902,7 +902,7 @@ fn implied_platform_markers(filename: &WheelFilename) -> MarkerTree {
                 tag_marker.and(MarkerTree::expression(MarkerExpression::String {
                     key: MarkerValueString::PlatformMachine,
                     operator: MarkerOperator::Equal,
-                    value: ArcStr::from(arch.linux_name()),
+                    value: ArcStr::from(arch.name()),
                 }));
                 marker.or(tag_marker);
             }

crates/uv-platform-tags/src/platform.rs

@@ -197,7 +197,7 @@ impl Arch {
         }
     }
 
-    /// Returns the standard name of the architecture in the Linux world.
+    /// Returns the standard name of the architecture.
     pub fn name(&self) -> &'static str {
         match self {
             Self::Aarch64 => "aarch64",
@@ -216,64 +216,22 @@ impl Arch {
         }
     }
 
-    /// Returns the standard name of the architecture in the FreeBSD world, if it differs from the
-    /// Linux name.
-    pub fn freebsd_name(&self) -> Option<&'static str> {
+    /// Represents the hardware platform.
+    ///
+    /// This is the same as the native platform's `uname -m` output.
+    ///
+    /// Based on: <https://github.com/PyO3/maturin/blob/8ab42219247277fee513eac753a3e90e76cd46b9/src/target/mod.rs#L131>
+    pub fn machine(&self) -> &'static str {
         match self {
-            Self::Aarch64 => None,
-            Self::Armv5TEL => Some("armv5"),
-            Self::Armv6L => Some("armv6"),
-            Self::Armv7L => Some("armv7"),
-            Self::Powerpc64Le => Some("powerpc64le"),
-            Self::Powerpc64 => Some("powerpc64"),
-            Self::Powerpc => Some("powerpc"),
-            Self::X86 => Some("i386"),
-            Self::X86_64 => Some("amd64"),
-            Self::S390X => None,
-            Self::LoongArch64 => None,
-            Self::Riscv64 => None,
-            Self::Wasm32 => None,
-        }
-    }
-
-    /// Returns the standard name of the architecture in the NetBSD world, if it differs from the
-    /// Linux name.
-    pub fn netbsd_name(&self) -> Option<&'static str> {
-        match self {
-            Self::Aarch64 => None,
-            Self::Armv5TEL => Some("armv5"),
-            Self::Armv6L => Some("armv6"),
-            Self::Armv7L => Some("armv7"),
-            Self::Powerpc64Le => Some("powerpc64le"),
-            Self::Powerpc64 => Some("powerpc64"),
-            Self::Powerpc => Some("powerpc"),
-            Self::X86 => Some("i386"),
-            Self::X86_64 => Some("amd64"),
-            Self::S390X => None,
-            Self::LoongArch64 => None,
-            Self::Riscv64 => None,
-            Self::Wasm32 => None,
-        }
-    }
-
-
-    /// Returns the standard name of the architecture in the FreeBSD world, if it differs from the
-    /// Linux name.
-    pub fn openbsd_name(&self) -> Option<&'static str> {
-        match self {
-            Self::Aarch64 => Some("arm64"),
-            Self::Armv5TEL => Some("armv5"),
-            Self::Armv6L => Some("armv6"),
-            Self::Armv7L => Some("armv7"),
-            Self::Powerpc64Le => Some("powerpc64le"),
-            Self::Powerpc64 => Some("powerpc64"),
-            Self::Powerpc => Some("powerpc"),
-            Self::X86 => Some("i386"),
-            Self::X86_64 => Some("amd64"),
-            Self::S390X => None,
-            Self::LoongArch64 => None,
-            Self::Riscv64 => None,
-            Self::Wasm32 => None,
+            Arch::Aarch64 => "arm64",
+            Arch::Armv5TEL | Arch::Armv6L | Arch::Armv7L => "arm",
+            Arch::Powerpc | Arch::Powerpc64Le | Arch::Powerpc64 => "powerpc",
+            Arch::X86 => "i386",
+            Arch::X86_64 => "amd64",
+            Arch::Riscv64 => "riscv",
+            Arch::Wasm32 => "wasm32",
+            Arch::S390X => "s390x",
+            Arch::LoongArch64 => "loongarch64",
         }
     }
 }

crates/uv-platform-tags/src/tags.rs

@@ -554,23 +554,23 @@ fn compatible_tags(platform: &Platform) -> Result<Vec<PlatformTag>, PlatformErro
         (Os::Windows, Arch::Aarch64) => vec![PlatformTag::WinArm64],
         (Os::FreeBsd { release }, arch) => {
             let release_tag = release.replace(['.', '-'], "_").to_lowercase();
-            let arch_tag = arch.freebsd_name().unwrap_or(arch.name());
+            let arch_tag = arch.machine();
             let release_arch = format!("{release_tag}_{arch_tag}");
             vec![PlatformTag::FreeBsd {
                 release_arch: SmallString::from(release_arch),
             }]
         }
         (Os::NetBsd { release }, arch) => {
-            let release_tag = release.replace(['.', '-'], "_").to_lowercase();
-            let arch_tag = arch.netbsd_name().unwrap_or(arch.name());
+            let release_tag = release.replace(['.', '-'], "_");
+            let arch_tag = arch.machine();
             let release_arch = format!("{release_tag}_{arch_tag}");
             vec![PlatformTag::NetBsd {
                 release_arch: SmallString::from(release_arch),
             }]
         }
         (Os::OpenBsd { release }, arch) => {
-            let release_tag = release.replace(['.', '-'], "_").to_lowercase();
-            let arch_tag = arch.openbsd_name().unwrap_or(arch.name());
+            let release_tag = release.replace(['.', '-'], "_");
+            let arch_tag = arch.machine();
             let release_arch = format!("{release_tag}_{arch_tag}");
             vec![PlatformTag::OpenBsd {
                 release_arch: SmallString::from(release_arch),