Fix clippy collapsible_if in find_name_in_mro cache populate

youknowone · youknowone · commit 2e39e80ef6e9 · 2026-03-03T19:58:20.000+09:00
diff --git a/crates/vm/src/builtins/type.rs b/crates/vm/src/builtins/type.rs
@@ -769,28 +769,27 @@ impl PyType {
         // Only cache positive results. Negative results are not cached to
         // avoid stale entries from transient MRO walk failures during
         // concurrent type modifications.
-        if let Some(ref found) = result {
-            if assigned != 0
-                && !TYPE_CACHE_CLEARING.load(Ordering::Acquire)
-                && self.tp_version_tag.load(Ordering::Acquire) == assigned
-            {
-                let idx = type_cache_hash(assigned, name);
-                let entry = &TYPE_CACHE[idx];
-                // Invalidate first to prevent readers from seeing partial state
-                entry.version.store(0, Ordering::Release);
-                // Swap in new value (refcount held by cache)
-                let new_ptr = found.clone().into_raw().as_ptr();
-                let old_ptr = entry.value.swap(new_ptr, Ordering::Relaxed);
-                entry
-                    .name
-                    .store(name as *const _ as *mut _, Ordering::Relaxed);
-                // Activate entry — Release ensures value/name writes are visible
-                entry.version.store(assigned, Ordering::Release);
-                // Drop previous occupant (its version was already invalidated)
-                if !old_ptr.is_null() {
-                    unsafe {
-                        drop(PyObjectRef::from_raw(NonNull::new_unchecked(old_ptr)));
-                    }
+        if let Some(ref found) = result
+            && assigned != 0
+            && !TYPE_CACHE_CLEARING.load(Ordering::Acquire)
+            && self.tp_version_tag.load(Ordering::Acquire) == assigned
+        {
+            let idx = type_cache_hash(assigned, name);
+            let entry = &TYPE_CACHE[idx];
+            // Invalidate first to prevent readers from seeing partial state
+            entry.version.store(0, Ordering::Release);
+            // Swap in new value (refcount held by cache)
+            let new_ptr = found.clone().into_raw().as_ptr();
+            let old_ptr = entry.value.swap(new_ptr, Ordering::Relaxed);
+            entry
+                .name
+                .store(name as *const _ as *mut _, Ordering::Relaxed);
+            // Activate entry — Release ensures value/name writes are visible
+            entry.version.store(assigned, Ordering::Release);
+            // Drop previous occupant (its version was already invalidated)
+            if !old_ptr.is_null() {
+                unsafe {
+                    drop(PyObjectRef::from_raw(NonNull::new_unchecked(old_ptr)));
                 }
             }
         }
