kargs: De-indent ostree reading logic

Instead of nested `if`, use `continue` to de-indent. Signed-off-by: Colin Walters <[email protected]>
cgwalters · Jun 28, 2024 · c4fdf8d · c4fdf8d
1 parent 600a5a5
commit c4fdf8d
Showing 1 changed file with 21 additions and 18 deletions.
diff --git a/lib/src/kargs.rs b/lib/src/kargs.rs
@@ -63,25 +63,28 @@ fn get_kargs_from_ostree(
     while let Some(fetched_info) = fetched_iter.next_file(cancellable)? {
         // only read and parse the file if it is a toml file
         let name = fetched_info.name();
-        if let Some(name) = name.to_str() {
-            if name.ends_with(".toml") {
-                let fetched_child = fetched_iter.child(&fetched_info);
-                let fetched_child = fetched_child
-                    .downcast::<ostree::RepoFile>()
-                    .expect("downcast");
-                fetched_child.ensure_resolved()?;
-                let fetched_contents_checksum = fetched_child.checksum();
-                let f =
-                    ostree::Repo::load_file(repo, fetched_contents_checksum.as_str(), cancellable)?;
-                let file_content = f.0;
-                let mut reader =
-                    ostree_ext::prelude::InputStreamExtManual::into_read(file_content.unwrap());
-                let s = std::io::read_to_string(&mut reader)?;
-                let parsed_kargs =
-                    parse_kargs_toml(&s, sys_arch).with_context(|| format!("Parsing {name}"))?;
-                ret.extend(parsed_kargs);
-            }
+        let name = if let Some(name) = name.to_str() {
+            name
+        } else {
+            continue;
+        };
+        if !name.ends_with(".toml") {
+            continue;
         }
+        let fetched_child = fetched_iter.child(&fetched_info);
+        let fetched_child = fetched_child
+            .downcast::<ostree::RepoFile>()
+            .expect("downcast");
+        fetched_child.ensure_resolved()?;
+        let fetched_contents_checksum = fetched_child.checksum();
+        let f = ostree::Repo::load_file(repo, fetched_contents_checksum.as_str(), cancellable)?;
+        let file_content = f.0;
+        let mut reader =
+            ostree_ext::prelude::InputStreamExtManual::into_read(file_content.unwrap());
+        let s = std::io::read_to_string(&mut reader)?;
+        let parsed_kargs =
+            parse_kargs_toml(&s, sys_arch).with_context(|| format!("Parsing {name}"))?;
+        ret.extend(parsed_kargs);
     }
     Ok(ret)
 }