From 4d8afcdd44b8c3e2cf0492222852a66a44469c03 Mon Sep 17 00:00:00 2001 From: Yuri Astrakhan Date: Fri, 19 Jul 2024 11:51:21 -0400 Subject: [PATCH] Avoid ref when using format! for perf Clean up a few minor refs in `format!` macro, as it has a tiny perf cost. A few more minor related cleanups. --- core/src/fmt/builders.rs | 2 +- core/tests/future.rs | 2 +- proc_macro/src/lib.rs | 4 ++-- std/src/fs/tests.rs | 2 +- std/src/io/error.rs | 2 +- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/core/src/fmt/builders.rs b/core/src/fmt/builders.rs index 4ccb585862cdf..36fae1c15960e 100644 --- a/core/src/fmt/builders.rs +++ b/core/src/fmt/builders.rs @@ -1026,7 +1026,7 @@ impl<'a, 'b: 'a> DebugMap<'a, 'b> { /// assert_eq!(format!("{}", value), "a"); /// assert_eq!(format!("{:?}", value), "'a'"); /// -/// let wrapped = fmt::FormatterFn(|f| write!(f, "{:?}", &value)); +/// let wrapped = fmt::FormatterFn(|f| write!(f, "{value:?}")); /// assert_eq!(format!("{}", wrapped), "'a'"); /// assert_eq!(format!("{:?}", wrapped), "'a'"); /// ``` diff --git a/core/tests/future.rs b/core/tests/future.rs index db417256dd01e..93aca72d59082 100644 --- a/core/tests/future.rs +++ b/core/tests/future.rs @@ -56,7 +56,7 @@ fn test_join() { let y = String::new(); let x = join!(async { - println!("{}", &y); + println!("{y}"); 1 }) .await; diff --git a/proc_macro/src/lib.rs b/proc_macro/src/lib.rs index 581d7e3efe373..57247359fbf29 100644 --- a/proc_macro/src/lib.rs +++ b/proc_macro/src/lib.rs @@ -1544,10 +1544,10 @@ impl fmt::Debug for Literal { fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { f.debug_struct("Literal") // format the kind on one line even in {:#?} mode - .field("kind", &format_args!("{:?}", &self.0.kind)) + .field("kind", &format_args!("{:?}", self.0.kind)) .field("symbol", &self.0.symbol) // format `Some("...")` on one line even in {:#?} mode - .field("suffix", &format_args!("{:?}", &self.0.suffix)) + .field("suffix", &format_args!("{:?}", self.0.suffix)) .field("span", &self.0.span) .finish() } diff --git a/std/src/fs/tests.rs b/std/src/fs/tests.rs index 5ca631399aa4a..c1fc2e5488d0c 100644 --- a/std/src/fs/tests.rs +++ b/std/src/fs/tests.rs @@ -683,7 +683,7 @@ fn recursive_rmdir_toctou() { let drop_canary_arc = Arc::new(()); let drop_canary_weak = Arc::downgrade(&drop_canary_arc); - eprintln!("x: {:?}", &victim_del_path); + eprintln!("x: {victim_del_path:?}"); // victim just continuously removes `victim_del` thread::spawn(move || { diff --git a/std/src/io/error.rs b/std/src/io/error.rs index f366cb8f42baa..8de27367a3f21 100644 --- a/std/src/io/error.rs +++ b/std/src/io/error.rs @@ -775,7 +775,7 @@ impl Error { /// /// impl Display for MyError { /// fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result { - /// write!(f, "MyError: {}", &self.v) + /// write!(f, "MyError: {}", self.v) /// } /// } ///