fix clippy, pull manylinux compatible var out up the stack so as to m…

…ake the change more minimal
astral-sh · Aug 12, 2024 · 2b57d6c · 2b57d6c
1 parent ee33c04
commit 2b57d6c
Show file tree

Hide file tree

Showing 2 changed files with 17 additions and 14 deletions.
diff --git a/crates/bench/benches/uv.rs b/crates/bench/benches/uv.rs
@@ -129,8 +129,9 @@ mod resolver {
         Arch::Aarch64,
     );
 
-    static TAGS: LazyLock<Tags> =
-        LazyLock::new(|| Tags::from_env(&PLATFORM, (3, 11), "cpython", (3, 11), false).unwrap());
+    static TAGS: LazyLock<Tags> = LazyLock::new(|| {
+        Tags::from_env(&PLATFORM, (3, 11), "cpython", (3, 11), false, false).unwrap()
+    });
 
     pub(crate) async fn resolve(
         manifest: Manifest,

diff --git a/crates/platform-tags/src/tags.rs b/crates/platform-tags/src/tags.rs
@@ -98,7 +98,17 @@ impl Tags {
         gil_disabled: bool,
     ) -> Result<Self, TagsError> {
         let implementation = Implementation::parse(implementation_name, gil_disabled)?;
-        let platform_tags = compatible_tags(platform, manylinux_compatible)?;
+
+        // If the interpreter is manylinux incompatible, we return an empty vector.
+        // This is the path that gets hit when user overrides the manylinux compatibility
+        // via adding `_manylinux` module to their standard library.
+        // See https://github.com/astral-sh/uv/issues/5915 for more details.
+        let platform_tags =
+            if matches!(platform.os(), Os::Manylinux { .. }) && !manylinux_compatible {
+                Vec::new()
+            } else {
+                compatible_tags(platform)?
+            };
 
         let mut tags = Vec::with_capacity(5 * platform_tags.len());
         // 1. This exact c api version
@@ -393,24 +403,14 @@ impl Implementation {
 /// and "any".
 ///
 /// Bit of a mess, needs to be cleaned up.
-fn compatible_tags(
-    platform: &Platform,
-    manylinux_compatible: bool,
-) -> Result<Vec<String>, PlatformError> {
+fn compatible_tags(platform: &Platform) -> Result<Vec<String>, PlatformError> {
     let os = platform.os();
     let arch = platform.arch();
 
     let platform_tags = match (&os, arch) {
         (Os::Manylinux { major, minor }, _) => {
             let mut platform_tags = Vec::new();
 
-            // If the interpreter is manylinux incompatible, we return an empty vector.
-            // This is the path that gets hit when user overrides the manylinux compatibility
-            // via adding `_manylinux` module to their standard library.
-            // See https://github.com/astral-sh/uv/issues/5915 for more details.
-            if !manylinux_compatible {
-                return Ok(platform_tags);
-            }
             if let Some(min_minor) = arch.get_minimum_manylinux_minor() {
                 for minor in (min_minor..=*minor).rev() {
                     platform_tags.push(format!("manylinux_{major}_{minor}_{arch}"));
@@ -962,6 +962,7 @@ mod tests {
             (3, 9),
             "cpython",
             (3, 9),
+            true,
             false,
         )
         .unwrap();
@@ -1586,6 +1587,7 @@ mod tests {
             "cpython",
             (3, 9),
             false,
+            false,
         )
         .unwrap();
         assert_snapshot!(