ksud: fix clippy

This commit is contained in:
tiann
2023-04-14 23:06:11 +08:00
parent 1fe53b9549
commit 29aaaae4b4

View File

@@ -193,7 +193,7 @@ fn mount_overlay_child(
) -> Result<()> { ) -> Result<()> {
if !module_roots if !module_roots
.iter() .iter()
.any(|lower| Path::new(&format!("{}{}", lower, relative)).exists()) .any(|lower| Path::new(&format!("{lower}{relative}")).exists())
{ {
return bind_mount(stock_root, mount_point); return bind_mount(stock_root, mount_point);
} }
@@ -202,7 +202,7 @@ fn mount_overlay_child(
} }
let mut lower_dirs: Vec<String> = vec![]; let mut lower_dirs: Vec<String> = vec![];
for lower in module_roots { for lower in module_roots {
let lower_dir = format!("{}{}", lower, relative); let lower_dir = format!("{lower}{relative}");
let path = Path::new(&lower_dir); let path = Path::new(&lower_dir);
if path.is_dir() { if path.is_dir() {
lower_dirs.push(lower_dir); lower_dirs.push(lower_dir);
@@ -251,7 +251,7 @@ pub fn mount_overlay(root: &String, module_roots: &Vec<String>) -> Result<()> {
continue; continue;
}; };
let relative = mount_point.replacen(root, "", 1); let relative = mount_point.replacen(root, "", 1);
let stock_root: String = format!("{}{}", stock_root, relative); let stock_root: String = format!("{stock_root}{relative}");
if !Path::new(&stock_root).exists() { if !Path::new(&stock_root).exists() {
continue; continue;
} }
@@ -260,7 +260,7 @@ pub fn mount_overlay(root: &String, module_roots: &Vec<String>) -> Result<()> {
"failed to mount overlay for child {}: {:#}, revert", "failed to mount overlay for child {}: {:#}, revert",
mount_point, e mount_point, e
); );
umount_dir(root).with_context(|| format!("failed to revert {}", root))?; umount_dir(root).with_context(|| format!("failed to revert {root}"))?;
bail!(e); bail!(e);
} }
} }