Format + reduce warnings

elkowar · Aug 19, 2023 · 9ff61ea · 9ff61ea
1 parent 334b1ce
commit 9ff61ea
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 5 deletions.
diff --git a/crates/eww/src/opts.rs b/crates/eww/src/opts.rs
@@ -226,7 +226,7 @@ fn parse_window_id_args(s: &str) -> Result<(String, VarName, DynVal)> {
     // Parse the = first so we know if an id has not been given
     let (name, value) = parse_var_update_arg(s)?;
 
-    let (id, var_name) = (&name.0).split_once(':').unwrap_or((&"", &name.0));
+    let (id, var_name) = name.0.split_once(':').unwrap_or(("", &name.0));
 
     Ok((id.to_string(), var_name.into(), value))
 }

diff --git a/crates/eww/src/window_arguments.rs b/crates/eww/src/window_arguments.rs
@@ -37,7 +37,9 @@ impl WindowArguments {
             size: WindowArguments::extract_value_from_args::<Coords>("size", &mut args)?,
             monitor: WindowArguments::extract_value_from_args::<MonitorIdentifier>("screen", &mut args)?,
             anchor: WindowArguments::extract_value_from_args::<AnchorPoint>("anchor", &mut args)?,
-            duration: WindowArguments::extract_value_from_args::<DynVal>("duration", &mut args)?.map(|x| x.as_duration()).transpose()?,
+            duration: WindowArguments::extract_value_from_args::<DynVal>("duration", &mut args)?
+                .map(|x| x.as_duration())
+                .transpose()?,
             args,
         };
 
@@ -63,7 +65,7 @@ impl WindowArguments {
             local_variables.insert(VarName::from("screen"), DynVal::from(monitor));
         }
 
-        local_variables.extend(self.args.clone().into_iter());
+        local_variables.extend(self.args.clone());
 
         for attr in &window_def.expected_args {
             let name = VarName::from(attr.name.clone());
@@ -73,8 +75,7 @@ impl WindowArguments {
         }
 
         if local_variables.len() != window_def.expected_args.len() {
-            let unexpected_vars: Vec<_> =
-                local_variables.iter().map(|(name, _)| name.clone()).filter(|n| !expected_args.contains(&n.0)).collect();
+            let unexpected_vars: Vec<_> = local_variables.keys().cloned().filter(|n| !expected_args.contains(&n.0)).collect();
             bail!(
                 "variables {} unexpectedly defined when creating window with id '{}'",
                 unexpected_vars.join(", "),