Skip to content

Commit 5452ae6

Browse files
committed
kargs: Use type inference
No need for explicit types in most of these places. Signed-off-by: Colin Walters <[email protected]>
1 parent 46516cd commit 5452ae6

File tree

1 file changed

+6
-6
lines changed

1 file changed

+6
-6
lines changed

lib/src/kargs.rs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -107,7 +107,7 @@ pub(crate) fn get_kargs(
107107
) -> Result<Vec<String>> {
108108
let cancellable = gio::Cancellable::NONE;
109109
let repo = &sysroot.repo();
110-
let mut kargs: Vec<String> = vec![];
110+
let mut kargs = vec![];
111111
let sys_arch = std::env::consts::ARCH;
112112

113113
// Get the kargs used for the merge in the bootloader config
@@ -120,7 +120,7 @@ pub(crate) fn get_kargs(
120120

121121
// Get the kargs in kargs.d of the merge
122122
let merge_root = &crate::utils::deployment_fd(sysroot, merge_deployment)?;
123-
let existing_kargs: Vec<String> = get_kargs_in_root(merge_root, sys_arch)?;
123+
let existing_kargs = get_kargs_in_root(merge_root, sys_arch)?;
124124

125125
// Get the kargs in kargs.d of the pending image
126126
let (fetched_tree, _) = repo.read_commit(fetched.ostree_commit.as_str(), cancellable)?;
@@ -139,16 +139,16 @@ pub(crate) fn get_kargs(
139139
let remote_kargs = get_kargs_from_ostree(repo, &fetched_tree, sys_arch)?;
140140

141141
// get the diff between the existing and remote kargs
142-
let mut added_kargs: Vec<String> = remote_kargs
142+
let mut added_kargs = remote_kargs
143143
.clone()
144144
.into_iter()
145145
.filter(|item| !existing_kargs.contains(item))
146-
.collect();
147-
let removed_kargs: Vec<String> = existing_kargs
146+
.collect::<Vec<_>>();
147+
let removed_kargs = existing_kargs
148148
.clone()
149149
.into_iter()
150150
.filter(|item| !remote_kargs.contains(item))
151-
.collect();
151+
.collect::<Vec<_>>();
152152

153153
tracing::debug!(
154154
"kargs: added={:?} removed={:?}",

0 commit comments

Comments
 (0)