Skip to content

Commit e40e235

Browse files
committed
kargs: De-indent ostree reading logic
Instead of nested `if`, use `continue` to de-indent. Signed-off-by: Colin Walters <[email protected]>
1 parent b9ea8b6 commit e40e235

File tree

1 file changed

+21
-18
lines changed

1 file changed

+21
-18
lines changed

lib/src/kargs.rs

Lines changed: 21 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -63,25 +63,28 @@ fn get_kargs_from_ostree(
6363
while let Some(fetched_info) = fetched_iter.next_file(cancellable)? {
6464
// only read and parse the file if it is a toml file
6565
let name = fetched_info.name();
66-
if let Some(name) = name.to_str() {
67-
if name.ends_with(".toml") {
68-
let fetched_child = fetched_iter.child(&fetched_info);
69-
let fetched_child = fetched_child
70-
.downcast::<ostree::RepoFile>()
71-
.expect("downcast");
72-
fetched_child.ensure_resolved()?;
73-
let fetched_contents_checksum = fetched_child.checksum();
74-
let f =
75-
ostree::Repo::load_file(repo, fetched_contents_checksum.as_str(), cancellable)?;
76-
let file_content = f.0;
77-
let mut reader =
78-
ostree_ext::prelude::InputStreamExtManual::into_read(file_content.unwrap());
79-
let s = std::io::read_to_string(&mut reader)?;
80-
let parsed_kargs =
81-
parse_kargs_toml(&s, sys_arch).with_context(|| format!("Parsing {name}"))?;
82-
ret.extend(parsed_kargs);
83-
}
66+
let name = if let Some(name) = name.to_str() {
67+
name
68+
} else {
69+
continue;
70+
};
71+
if !name.ends_with(".toml") {
72+
continue;
8473
}
74+
let fetched_child = fetched_iter.child(&fetched_info);
75+
let fetched_child = fetched_child
76+
.downcast::<ostree::RepoFile>()
77+
.expect("downcast");
78+
fetched_child.ensure_resolved()?;
79+
let fetched_contents_checksum = fetched_child.checksum();
80+
let f = ostree::Repo::load_file(repo, fetched_contents_checksum.as_str(), cancellable)?;
81+
let file_content = f.0;
82+
let mut reader =
83+
ostree_ext::prelude::InputStreamExtManual::into_read(file_content.unwrap());
84+
let s = std::io::read_to_string(&mut reader)?;
85+
let parsed_kargs =
86+
parse_kargs_toml(&s, sys_arch).with_context(|| format!("Parsing {name}"))?;
87+
ret.extend(parsed_kargs);
8588
}
8689
Ok(ret)
8790
}

0 commit comments

Comments
 (0)