Re-format with new rustfmt and fix new clippy errors

build.rs

@@ -21,7 +21,9 @@ fn main() -> Result<(), Error> {
     println!("cargo:rustc-env=RAGENIX_NIX_BIN_PATH={nix_bin_path}");
 
     // Make the paths to the shell completion files available as environment variables
-    let Some(outdir) = env::var_os("OUT_DIR") else { return Ok(()) };
+    let Some(outdir) = env::var_os("OUT_DIR") else {
+        return Ok(());
+    };
 
     let mut app = build();
     app.set_bin_name(crate_name!());

src/ragenix/mod.rs

@@ -125,7 +125,7 @@ pub(crate) fn parse_rules<P: AsRef<Path>>(rules_path: P) -> Result<Vec<RagenixRu
 
     // It's fine to force unwrap here as we validated the JSON schema
     let mut rules: Vec<RagenixRule> = Vec::new();
-    for (rel_path, val) in instance.as_object().unwrap().iter() {
+    for (rel_path, val) in instance.as_object().unwrap() {
         let dir = fs::canonicalize(rules_path.as_ref().parent().unwrap())?;
         let p = dir.join(rel_path);
         let public_keys = val.as_object().unwrap()["publicKeys"]

src/util.rs

@@ -146,7 +146,7 @@ mod test_split_editor {
 
     #[test]
     fn parse_editor_complex_2() -> Result<()> {
-        let actual = split_editor(r#"sed -i 's/.*/ x  /'"#)?;
+        let actual = split_editor(r"sed -i 's/.*/ x  /'")?;
         let expected = (
             String::from("sed"),
             Some(vec![String::from("-i"), String::from("s/.*/ x  /")]),
@@ -157,7 +157,7 @@ mod test_split_editor {
 
     #[test]
     fn parse_editor_stdin() -> Result<()> {
-        let actual = split_editor(r#" - "#)?;
+        let actual = split_editor(r" - ")?;
         let expected = (String::from("-"), None);
         assert_eq!(actual, expected);
         Ok(())