cargo clippy --fix

Author: MaxVerevkin

build.rs

@@ -18,7 +18,7 @@ fn main() {
             hash.trim(),
             date.trim_matches('\'')
         );
-        println!("cargo:rustc-env=VERSION={}", ver);
+        println!("cargo:rustc-env=VERSION={ver}");
     } else {
         println!("cargo:rustc-env=VERSION={}", env!("CARGO_PKG_VERSION"));
     }

src/blocks.rs

@@ -220,7 +220,7 @@ impl CommonApi {
     pub fn get_icon(&self, icon: &str) -> Result<String> {
         self.shared_config
             .get_icon(icon)
-            .or_error(|| format!("Icon '{}' not found", icon))
+            .or_error(|| format!("Icon '{icon}' not found"))
     }
 
     /// Repeatedly call provided async function until it succeeds.

src/blocks/battery/apc_ups.rs

@@ -26,18 +26,17 @@ impl PropertyMap {
     ) -> Result<T> {
         let stat = self
             .get(property_name)
-            .or_error(|| format!("{} not in apc ups data", property_name))?;
+            .or_error(|| format!("{property_name} not in apc ups data"))?;
         let (value, unit) = stat
             .split_once(' ')
-            .or_error(|| format!("could not split {}", property_name))?;
+            .or_error(|| format!("could not split {property_name}"))?;
         if unit == required_unit {
             value
                 .parse::<T>()
                 .map_err(|_| Error::new("Could not parse data"))
         } else {
             Err(Error::new(format!(
-                "Expected unit for {} are {}, but got {}",
-                property_name, required_unit, unit
+                "Expected unit for {property_name} are {required_unit}, but got {unit}"
             )))
         }
     }

src/blocks/custom_dbus.rs

@@ -156,7 +156,7 @@ pub async fn run(config: Config, mut api: CommonApi) -> Result<()> {
 
 async fn dbus_conn() -> Result<zbus::Connection> {
     let dbus_interface_name = match env::var("I3RS_DBUS_NAME") {
-        Ok(v) => format!("{}.{}", DBUS_NAME, v),
+        Ok(v) => format!("{DBUS_NAME}.{v}"),
         Err(_) => DBUS_NAME.to_string(),
     };
 

src/blocks/tea_timer.rs

@@ -63,9 +63,9 @@ pub async fn run(config: Config, mut api: CommonApi) -> Result<()> {
 
         widget.set_values(map!(
             "icon" => Value::icon(api.get_icon("tea")?),
-            [if is_timer_active] "hours" => Value::text(format!("{:02}", hours)),
-            [if is_timer_active] "minutes" => Value::text(format!("{:02}", minutes)),
-            [if is_timer_active] "seconds" => Value::text(format!("{:02}", seconds)),
+            [if is_timer_active] "hours" => Value::text(format!("{hours:02}")),
+            [if is_timer_active] "minutes" => Value::text(format!("{minutes:02}")),
+            [if is_timer_active] "seconds" => Value::text(format!("{seconds:02}")),
         ));
 
         api.set_widget(&widget).await?;

src/blocks/temperature.rs

@@ -149,8 +149,7 @@ pub async fn run(config: Config, mut api: CommonApi) -> Result<()> {
                                     vals.push(config.scale.from_celsius(value));
                                 } else {
                                     eprintln!(
-                                        "Temperature ({}) outside of range ([-100, 150])",
-                                        value
+                                        "Temperature ({value}) outside of range ([-100, 150])"
                                     );
                                 }
                             }

src/blocks/weather/open_weather_map.rs

@@ -86,8 +86,8 @@ impl WeatherProvider for Service {
                     .as_ref()
                     .map(|(lat, lon)| format!("lat={lat}&lon={lon}"))
             })
-            .or_else(|| self.config.city_id.as_ref().map(|x| format!("id={}", x)))
-            .or_else(|| self.config.place.as_ref().map(|x| format!("q={}", x)))
+            .or_else(|| self.config.city_id.as_ref().map(|x| format!("id={x}")))
+            .or_else(|| self.config.place.as_ref().map(|x| format!("q={x}")))
             .error("no location was provided")?;
 
         // Refer to https://openweathermap.org/current

src/click.rs

@@ -44,9 +44,7 @@ impl ClickHandler {
                     } else {
                         spawn_shell(cmd)
                     }
-                    .or_error(|| {
-                        format!("'{:?}' button handler: Failed to run '{}", button, cmd)
-                    })?;
+                    .or_error(|| format!("'{button:?}' button handler: Failed to run '{cmd}"))?;
                 }
                 PostActions {
                     pass: entry.pass,

src/errors.rs

@@ -165,17 +165,17 @@ impl fmt::Display for Error {
                 write!(f, " in {}", block.0)?;
 
                 if let Some(message) = &self.message {
-                    write!(f, ": {}", message)?;
+                    write!(f, ": {message}")?;
                 }
 
                 if let Some(cause) = &self.cause {
-                    write!(f, ". (Cause: {})", cause)?;
+                    write!(f, ". (Cause: {cause})")?;
                 }
             }
             None => {
                 f.write_str(self.message.as_deref().unwrap_or("Error"))?;
                 if let Some(cause) = &self.cause {
-                    write!(f, ". (Cause: {})", cause)?;
+                    write!(f, ". (Cause: {cause})")?;
                 }
             }
         }

src/formatting/formatter.rs

@@ -128,7 +128,7 @@ pub fn new_formatter(name: &str, args: &[String]) -> Result<Box<dyn Formatter>>
         }
         "eng" => Ok(Box::new(EngFormatter(EngFixConfig::from_args(args)?))),
         "fix" => Ok(Box::new(FixFormatter(EngFixConfig::from_args(args)?))),
-        _ => Err(Error::new(format!("Unknown formatter: '{}'", name))),
+        _ => Err(Error::new(format!("Unknown formatter: '{name}'"))),
     }
 }