Fix clippy errors

Author: amankrx

nativelink-util/src/evicting_map.rs

@@ -435,33 +435,44 @@ where
     }
 
     pub async fn get(&self, key: &Q) -> Option<T> {
-        let (result, items_to_unref, removal_futures) = {
+        // Collect any early-return cleanup items separately to avoid holding
+        // the lock across an await point.
+        let early_return_cleanup = {
             let mut state = self.state.lock();
-            // Check if the requested item is expired before promoting it.
-            let result = if let Some(entry) = state.lru.peek(key.borrow()) {
+            if let Some(entry) = state.lru.peek(key.borrow()) {
                 if self.should_evict(state.lru.len(), entry, 0, u64::MAX) {
-                    // Item is expired, remove it.
                     if let Some((k, eviction_item)) = state.lru.pop_entry(key.borrow()) {
                         let (data, futures) = state.remove(k.borrow(), &eviction_item, false);
                         let (mut items, mut removals) = self.evict_items(&mut *state);
                         items.push(data);
                         removals.extend(futures);
-                        return {
-                            Self::unref_items(items, removals).await;
-                            None
-                        };
+                        Some((items, removals))
+                    } else {
+                        None
                     }
-                    None
                 } else {
-                    // Item is valid. Promote it in LRU so it's safe from eviction.
-                    state.lru.get_mut(key.borrow()).map(|entry| {
-                        entry.seconds_since_anchor =
-                            i32::try_from(self.anchor_time.elapsed().as_secs()).unwrap_or(i32::MAX);
-                        entry.data.clone()
-                    })
+                    None
                 }
             } else {
                 None
+            }
+        };
+        if let Some((items, removals)) = early_return_cleanup {
+            Self::unref_items(items, removals).await;
+            return None;
+        }
+
+        let (result, items_to_unref, removal_futures) = {
+            let mut state = self.state.lock();
+            let result = if let Some(_entry) = state.lru.peek(key.borrow()) {
+                // Item is valid. Promote it in LRU so it's safe from eviction.
+                state.lru.get_mut(key.borrow()).map(|entry| {
+                    entry.seconds_since_anchor =
+                        i32::try_from(self.anchor_time.elapsed().as_secs()).unwrap_or(i32::MAX);
+                    entry.data.clone()
+                })
+            } else {
+                None
             };
             // Evict other items if needed
             let (items_to_unref, removal_futures) = self.evict_items(&mut *state);

nativelink-util/src/instant_wrapper.rs

@@ -88,7 +88,7 @@ impl InstantWrapper for MockInstantWrapped {
         let baseline = self.0.elapsed();
         loop {
             tokio::task::yield_now().await;
-            if self.0.elapsed() - baseline >= duration {
+            if self.0.elapsed().saturating_sub(baseline) >= duration {
                 break;
             }
         }