Merge pull request #340 from nyurik/inline-args

Inline format args

MIGRATION-GUIDE.md

@@ -211,10 +211,7 @@ use moka::notification::ListenerFuture;
 use moka::future::FutureExt;
 
 let eviction_listener = move |k, v: PathBuf, cause| -> ListenerFuture {
-    println!(
-        "\n== An entry has been evicted. k: {:?}, v: {:?}, cause: {:?}",
-        k, v, cause
-    );
+    println!("\n== An entry has been evicted. k: {k:?}, v: {v:?}, cause: {cause:?}");
     let file_mgr2 = Arc::clone(&file_mgr1);
 
     // Create a Future that removes the data file at the path `v`.
@@ -224,7 +221,7 @@ let eviction_listener = move |k, v: PathBuf, cause| -> ListenerFuture {
         // Remove the data file. We must handle error cases here to
         // prevent the listener from panicking.
         if let Err(_e) = mgr.remove_data_file(v.as_path()).await {
-            eprintln!("Failed to remove a data file at {:?}", v);
+            eprintln!("Failed to remove a data file at {v:?}");
         }
     }
     // Convert the regular Future into ListenerFuture. This method is

README.md

@@ -180,7 +180,7 @@ use moka::sync::Cache;
 use std::thread;
 
 fn value(n: usize) -> String {
-    format!("value {}", n)
+    format!("value {n}")
 }
 
 fn main() {
@@ -282,7 +282,7 @@ async fn main() {
     const NUM_KEYS_PER_TASK: usize = 64;
 
     fn value(n: usize) -> String {
-        format!("value {}", n)
+        format!("value {n}")
     }
 
     // Create a cache that can store up to 10,000 entries.

examples/async_example.rs

@@ -7,7 +7,7 @@ async fn main() {
     const NUM_KEYS_PER_TASK: usize = 64;
 
     fn value(n: usize) -> String {
-        format!("value {}", n)
+        format!("value {n}")
     }
 
     // Create a cache that can store up to 10,000 entries.

examples/eviction_listener.rs

@@ -9,7 +9,7 @@ fn main() {
             .max_capacity(2)
             .time_to_live(Duration::from_secs(1))
             .eviction_listener(|key, value, cause| {
-                println!("Evicted ({:?},{:?}) because {:?}", key, value, cause)
+                println!("Evicted ({key:?},{value:?}) because {cause:?}")
             })
             .build();
         // Overload capacity of the cache.

examples/sync_example.rs

@@ -4,7 +4,7 @@ use moka::sync::Cache;
 use std::thread;
 
 fn value(n: usize) -> String {
-    format!("value {}", n)
+    format!("value {n}")
 }
 
 fn main() {

src/cht/map/bucket.rs

@@ -443,7 +443,7 @@ impl<'g, K: 'g, V: 'g> BucketArray<K, V> {
                 // We need to return here to see if rehashing is still needed.
                 return None;
             }
-            Err(e @ TryLockError::Poisoned(_)) => panic!("{:?}", e),
+            Err(e @ TryLockError::Poisoned(_)) => panic!("{e:?}"),
         };
 
         let next_array = self.next_array(guard, rehash_op);

src/common.rs

@@ -30,7 +30,7 @@ impl From<usize> for CacheRegion {
             1 => Self::MainProbation,
             2 => Self::MainProtected,
             3 => Self::Other,
-            _ => panic!("No such CacheRegion variant for {}", n),
+            _ => panic!("No such CacheRegion variant for {n}"),
         }
     }
 }

src/common/concurrent/deques.rs

@@ -106,10 +106,7 @@ impl<K> Deques<K> {
                     unsafe { deq.move_to_back(node) };
                 }
             } else {
-                panic!(
-                    "move_to_back_ao_in_deque - node is not a member of {} deque. {:?}",
-                    deq_name, p,
-                )
+                panic!("move_to_back_ao_in_deque - node is not a member of {deq_name} deque. {p:?}")
             }
         }
     }
@@ -187,10 +184,7 @@ impl<K> Deques<K> {
                 deq.unlink_and_drop(node);
             }
         } else {
-            panic!(
-                "unlink_node - node is not a member of {} deque. {:?}",
-                deq_name, p
-            )
+            panic!("unlink_node - node is not a member of {deq_name} deque. {p:?}")
         }
     }
 

src/common/concurrent/entry_info.rs

@@ -179,7 +179,7 @@ mod test {
         if let Some(size) = expected {
             assert_eq!(size_of::<EntryInfo<()>>(), size);
         } else {
-            panic!("No expected size for {:?} with Rust version {}", arch, ver);
+            panic!("No expected size for {arch:?} with Rust version {ver}");
         }
     }
 }

src/common/timer_wheel.rs

@@ -327,9 +327,7 @@ impl<K> TimerWheel<K> {
         let deque = &mut self.wheels[level][index];
         debug_assert!(
             deque.len() > 0,
-            "BUG: The queue is empty. level: {}, index: {}",
-            level,
-            index
+            "BUG: The queue is empty. level: {level}, index: {index}"
         );
 
         // Rotate the nodes in the queue until we see the sentinel at the back of the
@@ -661,15 +659,15 @@ mod tests {
             let entry = maybe_entry.expect("entry is none");
             match entry {
                 TimerEvent::Expired(node) => *node.element.entry_info().key_hash().key,
-                _ => panic!("Expected an expired entry. Got {:?}", entry),
+                _ => panic!("Expected an expired entry. Got {entry:?}"),
             }
         }
 
         fn rescheduled_key(maybe_entry: Option<TimerEvent<u32>>) -> u32 {
             let entry = maybe_entry.expect("entry is none");
             match entry {
                 TimerEvent::Rescheduled(entry) => *entry.key_hash().key,
-                _ => panic!("Expected a rescheduled entry. Got {:?}", entry),
+                _ => panic!("Expected a rescheduled entry. Got {entry:?}"),
             }
         }
 

src/future/base_cache.rs

@@ -2718,8 +2718,7 @@ mod tests {
             assert_eq!(
                 cache.inner.frequency_sketch.read().await.table_len(),
                 len as usize,
-                "{}",
-                name
+                "{name}"
             );
         }
 
@@ -2939,8 +2938,9 @@ mod tests {
                         new_duration.map(Duration::from_secs)
                     }
                     expected => {
-                        panic!("Unexpected call to expire_after_create: caller_line {}, expected: {:?}",
-                            line!(), expected
+                        panic!(
+                            "Unexpected call to expire_after_create: caller_line {}, expected: {expected:?}",
+                            line!()
                         );
                     }
                 }
@@ -2992,9 +2992,8 @@ mod tests {
                     }
                     expected => {
                         panic!(
-                            "Unexpected call to expire_after_read: caller_line {}, expected: {:?}",
-                            line!(),
-                            expected
+                            "Unexpected call to expire_after_read: caller_line {}, expected: {expected:?}",
+                            line!()
                         );
                     }
                 }
@@ -3037,8 +3036,9 @@ mod tests {
                         new_duration_secs.map(Duration::from_secs)
                     }
                     expected => {
-                        panic!("Unexpected call to expire_after_update: caller_line {}, expected: {:?}",
-                            line!(), expected
+                        panic!(
+                            "Unexpected call to expire_after_update: caller_line {}, expected: {expected:?}",
+                            line!()
                         );
                     }
                 }