Update some more format strings

compatibility-tests/futures/src/lib.rs

@@ -37,7 +37,7 @@ enum Error {
         name: String,
     },
 
-    #[snafu(whatever, display("{}", message))]
+    #[snafu(whatever, display("{message}"))]
     UnableToLoadOtherStock {
         message: String,
 
@@ -66,9 +66,9 @@ async fn load_stock_data_sequential() -> Result<String, Error> {
     let symbol = "other_2";
     let other_2 = api::fetch_page(symbol)
         .await
-        .with_whatever_context(|_| format!("Unable to get stock prices for: {}", symbol))?;
+        .with_whatever_context(|_| format!("Unable to get stock prices for: {symbol}"))?;
 
-    Ok(format!("{}+{}+{}+{}", apple, google, other_1, other_2))
+    Ok(format!("{apple}+{google}+{other_1}+{other_2}"))
 }
 
 // Can be used as a `Future` combinator
@@ -80,12 +80,12 @@ async fn load_stock_data_concurrent() -> Result<String, Error> {
     let other_1 = api::fetch_page("other_1").whatever_context::<_, Error>("Oh no!");
     let symbol = "other_2";
     let other_2 = api::fetch_page(symbol)
-        .with_whatever_context(|_| format!("Unable to get stock prices for: {}", symbol));
+        .with_whatever_context(|_| format!("Unable to get stock prices for: {symbol}"));
 
     let (apple, google, other_1, other_2) =
         future::try_join4(apple, google, other_1, other_2).await?;
 
-    Ok(format!("{}+{}+{}+{}", apple, google, other_1, other_2))
+    Ok(format!("{apple}+{google}+{other_1}+{other_2}"))
 }
 
 // Return values of the combinators implement `Future`
@@ -106,10 +106,10 @@ async fn load_stock_data_sequential_again() -> Result<String, Error> {
 
     let symbol = "other_2";
     let other_2 = api::fetch_page(symbol)
-        .with_whatever_context(|_| format!("Unable to get stock prices for: {}", symbol))
+        .with_whatever_context(|_| format!("Unable to get stock prices for: {symbol}"))
         .await?;
 
-    Ok(format!("{}+{}+{}+{}", apple, google, other_1, other_2))
+    Ok(format!("{apple}+{google}+{other_1}+{other_2}"))
 }
 
 // Can be used as a `Stream` combinator
@@ -121,7 +121,7 @@ async fn load_stock_data_series() -> Result<String, Error> {
     let other_1 = api::keep_fetching_page("other_1").whatever_context("Oh no!");
     let symbol = "other_2";
     let other_2 = api::keep_fetching_page(symbol)
-        .with_whatever_context(|_| format!("Unable to get stock prices for: {}", symbol));
+        .with_whatever_context(|_| format!("Unable to get stock prices for: {symbol}"));
 
     let together = apple.zip(google).zip(other_1).zip(other_2);
 
@@ -132,7 +132,7 @@ async fn load_stock_data_series() -> Result<String, Error> {
         .take(10)
         .try_fold(String::new(), |mut acc, (a, g, o1, o2)| {
             use std::fmt::Write;
-            writeln!(&mut acc, "{}+{}+{}+{}", a, g, o1, o2).expect("Could not format");
+            writeln!(&mut acc, "{a}+{g}+{o1}+{o2}").expect("Could not format");
             future::ready(Ok(acc))
         })
         .await

compatibility-tests/futures/src/location.rs

@@ -21,7 +21,7 @@ struct ManuallyWrappedError {
 }
 
 #[derive(Debug, Snafu)]
-#[snafu(display("{}", message))]
+#[snafu(display("{message}"))]
 #[snafu(whatever)]
 pub struct MyWhatever {
     #[snafu(source(from(Box<dyn std::error::Error>, Some)))]

src/futures/try_future.rs

@@ -138,7 +138,7 @@ pub trait TryFutureExt: TryFuture + Sized {
     ///
     /// fn example(arg: &'static str) -> impl TryFuture<Ok = i32, Error = Whatever> {
     ///     api_function(arg)
-    ///         .with_whatever_context(move |_| format!("The API failed for argument {}", arg))
+    ///         .with_whatever_context(move |_| format!("The API failed for argument {arg}"))
     /// }
     ///
     /// # type ApiError = Box<dyn std::error::Error>;

src/futures/try_stream.rs

@@ -141,7 +141,7 @@ pub trait TryStreamExt: TryStream + Sized {
     ///
     /// fn example(symbol: &'static str) -> impl TryStream<Ok = i32, Error = Whatever> {
     ///     stock_prices(symbol)
-    ///         .with_whatever_context(move |_| format!("Couldn't get stock prices for {}", symbol))
+    ///         .with_whatever_context(move |_| format!("Couldn't get stock prices for {symbol}"))
     /// }
     ///
     /// # type ApiError = Box<dyn std::error::Error>;

src/guide/comparison/failure.md

@@ -16,10 +16,10 @@ use std::ops::Range;
 
 fn check_range(x: usize, range: Range<usize>) -> Result<usize, Whatever> {
     if x < range.start {
-        whatever!("{} is below {}", x, range.start);
+        whatever!("{x} is below {}", range.start);
     }
     if x >= range.end {
-        whatever!("{} is above {}", x, range.end);
+        whatever!("{x} is above {}", range.end);
     }
     Ok(x)
 }

src/lib.rs

@@ -42,7 +42,7 @@
 //!
 //! fn is_valid_id(id: u16) -> Result<(), Whatever> {
 //!     if id < 10 {
-//!         whatever!("ID may not be less than 10, but it was {}", id);
+//!         whatever!("ID may not be less than 10, but it was {id}");
 //!     }
 //!     Ok(())
 //! }
@@ -55,7 +55,7 @@
 //!
 //! fn read_config_file(path: &str) -> Result<String, Whatever> {
 //!     std::fs::read_to_string(path)
-//!         .with_whatever_context(|_| format!("Could not read file {}", path))
+//!         .with_whatever_context(|_| format!("Could not read file {path}"))
 //! }
 //! ```
 //!
@@ -67,10 +67,10 @@
 //!
 //! # fn returns_an_error() -> Result<(), Whatever> { Ok(()) }
 //! if let Err(e) = returns_an_error() {
-//!     eprintln!("An error occurred: {}", e);
+//!     eprintln!("An error occurred: {e}");
 //!     if let Some(bt) = ErrorCompat::backtrace(&e) {
 //! #       #[cfg(not(feature = "backtraces-impl-backtrace-crate"))]
-//!         eprintln!("{}", bt);
+//!         eprintln!("{bt}");
 //!     }
 //! }
 //! ```
@@ -516,8 +516,7 @@ macro_rules! whatever {
 /// # fn moon_is_rising() -> bool { false }
 ///     ensure_whatever!(
 ///         moon_is_rising(),
-///         "We are recalibrating the dynamos for account {}, sorry",
-///         account_id,
+///         "We are recalibrating the dynamos for account {account_id}, sorry",
 ///     );
 ///
 ///     Ok(100)
@@ -658,7 +657,7 @@ pub trait ResultExt<T, E>: Sized {
     /// fn example() -> Result<(), Whatever> {
     ///     let filename = "/this/does/not/exist";
     ///     std::fs::read_to_string(filename)
-    ///         .with_whatever_context(|_| format!("couldn't open the file {}", filename))?;
+    ///         .with_whatever_context(|_| format!("couldn't open the file {filename}"))?;
     ///     Ok(())
     /// }
     ///
@@ -912,7 +911,7 @@ pub trait OptionExt<T>: Sized {
     ///
     /// fn example(user_id: i32) -> Result<(), Error> {
     ///     let name = username(user_id).context(UserLookupSnafu { user_id })?;
-    ///     println!("Username was {}", name);
+    ///     println!("Username was {name}");
     ///     Ok(())
     /// }
     ///
@@ -951,7 +950,7 @@ pub trait OptionExt<T>: Sized {
     ///         user_id,
     ///         previous_ids: Vec::new(),
     ///     })?;
-    ///     println!("Username was {}", name);
+    ///     println!("Username was {name}");
     ///     Ok(())
     /// }
     ///
@@ -1012,7 +1011,7 @@ pub trait OptionExt<T>: Sized {
     ///
     /// fn example(env_var_name: &str) -> Result<(), Whatever> {
     ///     std::env::var_os(env_var_name).with_whatever_context(|| {
-    ///         format!("couldn't get the environment variable {}", env_var_name)
+    ///         format!("couldn't get the environment variable {env_var_name}")
     ///     })?;
     ///     Ok(())
     /// }
@@ -1566,7 +1565,7 @@ macro_rules! location {
 ///     if a > b {
 ///         Ok(a - b)
 ///     } else {
-///         whatever!("Can't subtract {} - {}", a, b)
+///         whatever!("Can't subtract {a} - {b}")
 ///     }
 /// }
 ///

tests/backtrace.rs

@@ -4,7 +4,7 @@ type AnotherError = Box<dyn std::error::Error>;
 
 #[derive(Debug, Snafu)]
 enum Error {
-    #[snafu(display("Invalid user {}:\n{}", user_id, backtrace))]
+    #[snafu(display("Invalid user {user_id}:\n{backtrace}"))]
     InvalidUser { user_id: i32, backtrace: Backtrace },
     WithSource {
         source: AnotherError,

tests/basic.rs

@@ -11,9 +11,9 @@ enum Error {
         filename: PathBuf,
         source: io::Error,
     },
-    #[snafu(display("Could not open config file at {}", source))]
+    #[snafu(display("Could not open config file at {source}"))]
     SaveConfig { source: io::Error },
-    #[snafu(display("User ID {} is invalid", user_id))]
+    #[snafu(display("User ID {user_id} is invalid"))]
     InvalidUser { user_id: i32 },
     #[snafu(display("No user available"))]
     MissingUser,

tests/doc_comment.rs

@@ -9,7 +9,7 @@ enum Error {
     MissingUser,
 
     /// This is just a doc comment.
-    #[snafu(display("This is {}", stronger))]
+    #[snafu(display("This is {stronger}"))]
     Stronger { stronger: &'static str },
 
     #[doc(hidden)]

tests/error_chain.rs

@@ -3,7 +3,7 @@ use std::fmt::Debug;
 
 #[derive(Debug, Clone, Snafu, PartialEq)]
 enum LeafError {
-    #[snafu(display("User ID {} is invalid", user_id))]
+    #[snafu(display("User ID {user_id} is invalid"))]
     InvalidUser { user_id: i32 },
     #[snafu(display("no user available"))]
     MissingUser,

tests/generics.rs

@@ -60,7 +60,7 @@ mod bounds {
 
         #[derive(Debug, Snafu)]
         enum Error<T: Display> {
-            #[snafu(display("Boom: {}", value))]
+            #[snafu(display("Boom: {value}"))]
             Boom { value: T },
         }
 
@@ -86,7 +86,7 @@ mod bounds {
         where
             T: Display,
         {
-            #[snafu(display("Boom: {}", value))]
+            #[snafu(display("Boom: {value}"))]
             Boom { value: T },
         }
 

tests/generics_with_default.rs

@@ -14,7 +14,7 @@ mod default_with_lifetime {
         T: Display,
         S: std::error::Error + AsErrorSource,
     {
-        #[snafu(display("Boom: {}", value))]
+        #[snafu(display("Boom: {value}"))]
         Boom {
             value: T,
             name: &'a str,

tests/location.rs

@@ -5,7 +5,7 @@ mod basics {
 
     #[derive(Debug, Snafu)]
     enum Error {
-        #[snafu(display("Created at {}", location))]
+        #[snafu(display("Created at {location}"))]
         Usage {
             #[snafu(implicit)]
             location: Location,
@@ -54,7 +54,7 @@ mod track_caller {
     }
 
     #[derive(Debug, Snafu)]
-    #[snafu(display("{}", message))]
+    #[snafu(display("{message}"))]
     #[snafu(whatever)]
     pub struct MyWhatever {
         #[snafu(source(from(Box<dyn std::error::Error>, Some)))]

tests/multiple_attributes.rs

@@ -35,5 +35,5 @@ fn example() -> Result<u8, InnerError> {
 #[test]
 fn has_display() {
     let err = example().context(error::AlphaSnafu).unwrap_err();
-    assert_eq!(format!("{}", err), "Moo");
+    assert_eq!(err.to_string(), "Moo");
 }

tests/opaque.rs

@@ -20,7 +20,7 @@ mod inner {
 
     #[derive(Debug, Snafu)]
     enum InnerError {
-        #[snafu(display("The value {} is too big", count))]
+        #[snafu(display("The value {count} is too big"))]
         TooBig { count: i32 },
     }
 

tests/options.rs

@@ -3,9 +3,9 @@ use std::collections::HashMap;
 
 #[derive(Debug, Snafu)]
 enum Error {
-    #[snafu(display("The left-hand argument {} was missing", "id"))]
+    #[snafu(display("The left-hand argument {id} was missing"))]
     LeftHandMissing { id: i32, backtrace: Backtrace },
-    #[snafu(display("The right-hand argument {} was missing", "id"))]
+    #[snafu(display("The right-hand argument {id} was missing"))]
     RightHandMissing { id: i32, backtrace: Backtrace },
 }
 

tests/report.rs

@@ -135,8 +135,8 @@ fn debug_and_display_are_the_same() {
     let e = OuterSnafu.into_error(InnerError);
     let r = Report::from_error(e);
 
-    let display = format!("{}", r);
-    let debug = format!("{:?}", r);
+    let display = format!("{r}",);
+    let debug = format!("{r:?}");
 
     assert_eq!(display, debug);
 }

tests/single_use_lifetimes_lint.rs

@@ -4,9 +4,9 @@ use snafu::prelude::*;
 
 #[derive(Debug, Snafu)]
 pub enum Enum<'id> {
-    #[snafu(display("`{}` is foo, yo", to))]
+    #[snafu(display("`{to}` is foo, yo"))]
     Foo { to: &'id u32 },
-    #[snafu(display("bar `{}` frobnicated `{}`", from, to))]
+    #[snafu(display("bar `{from}` frobnicated `{to}`"))]
     Bar { from: &'id String, to: &'id i8 },
 }
 

tests/stringly_typed.rs

@@ -6,7 +6,7 @@ mod message_only {
 
     #[derive(Debug, Snafu)]
     enum Error {
-        #[snafu(whatever, display("{}", message))]
+        #[snafu(whatever, display("{message}"))]
         Whatever { message: String },
     }
 
@@ -53,7 +53,7 @@ mod message_and_source {
     #[derive(Debug, Snafu)]
     enum Error {
         // THOUGHT: Should display automatically do message?
-        #[snafu(whatever, display("{}", message))]
+        #[snafu(whatever, display("{message}"))]
         Whatever {
             #[snafu(source(from(Box<dyn std::error::Error>, Some)))]
             source: Option<Box<dyn std::error::Error>>,
@@ -210,7 +210,7 @@ mod struck {
         use snafu::{prelude::*, Backtrace};
 
         #[derive(Debug, Snafu)]
-        #[snafu(whatever, display("{}", message))]
+        #[snafu(whatever, display("{message}"))]
         struct Error {
             #[snafu(source(from(Box<dyn std::error::Error>, Some)))]
             source: Option<Box<dyn std::error::Error>>,
@@ -252,7 +252,7 @@ mod send_and_sync {
 
     #[derive(Debug, Snafu)]
     enum Error {
-        #[snafu(whatever, display("{}", message))]
+        #[snafu(whatever, display("{message}"))]
         Whatever {
             #[snafu(source(from(Box<dyn std::error::Error + Send + Sync>, Some)))]
             source: Option<Box<dyn std::error::Error + Send + Sync>>,

tests/structs/from_option.rs

@@ -1,7 +1,7 @@
 use snafu::{prelude::*, Backtrace};
 
 #[derive(Debug, Snafu)]
-#[snafu(display("The argument at index {} was missing", idx))]
+#[snafu(display("The argument at index {idx} was missing"))]
 struct Error {
     idx: usize,
     backtrace: Backtrace,

tests/structs/generics.rs

@@ -60,7 +60,7 @@ mod bounds {
         use std::fmt::Display;
 
         #[derive(Debug, Snafu)]
-        #[snafu(display("key: {}", key))]
+        #[snafu(display("key: {key}"))]
         struct Error<T: Display> {
             key: T,
         }
@@ -78,7 +78,7 @@ mod bounds {
         use std::fmt::Display;
 
         #[derive(Debug, Snafu)]
-        #[snafu(display("key: {}", key))]
+        #[snafu(display("key: {key}"))]
         struct Error<T>
         where
             T: Display,

tests/structs/with_source.rs

@@ -7,7 +7,7 @@ use std::{
 };
 
 #[derive(Debug, Snafu)]
-#[snafu(display("filename: {}, source: {}", filename.display(), source))]
+#[snafu(display("filename: {}, source: {source}", filename.display()))]
 struct Error {
     filename: PathBuf,
     source: io::Error,