code cleaning & clippy fix
All checks were successful
Rust / build (push) Successful in 2m4s

This commit is contained in:
PurpleCow 2025-05-22 03:32:48 +02:00
parent 0c13a7b258
commit f2cb66ec29
7 changed files with 24 additions and 25 deletions

View File

@ -166,7 +166,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
sgdisk sgdisk
.execute() .execute()
.args(&[ .args([
"-Z", "-Z",
"-o", "-o",
&format!("--new=1::+{}M", boot_size), &format!("--new=1::+{}M", boot_size),
@ -175,7 +175,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
"--typecode=1:EF00", "--typecode=1:EF00",
"--typecode=2:EF02", "--typecode=2:EF02",
]) ])
.arg(&disk_path) .arg(disk_path)
.run() .run()
.context("Partitioning error")?; .context("Partitioning error")?;
@ -270,14 +270,14 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&["passwd", "-d", "root"]) .args(["passwd", "-d", "root"])
.run() .run()
.context("Failed to delete the root password")?; .context("Failed to delete the root password")?;
info!("Setting locale"); info!("Setting locale");
fs::OpenOptions::new() fs::OpenOptions::new()
.append(true) .append(true)
.write(true) //.write(true)
.open(mount_point.path().join("etc/locale.gen")) .open(mount_point.path().join("etc/locale.gen"))
.and_then(|mut locale_gen| locale_gen.write_all(b"en_US.UTF-8 UTF-8\n")) .and_then(|mut locale_gen| locale_gen.write_all(b"en_US.UTF-8 UTF-8\n"))
.context("Failed to create locale.gen")?; .context("Failed to create locale.gen")?;
@ -298,7 +298,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&["useradd", "-m", "aur"]) .args(["useradd", "-m", "aur"])
.run() .run()
.context("Failed to create temporary user to install AUR packages")?; .context("Failed to create temporary user to install AUR packages")?;
@ -309,7 +309,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&["sudo", "-u", "aur"]) .args(["sudo", "-u", "aur"])
.arg("git") .arg("git")
.arg("clone") .arg("clone")
.arg(format!( .arg(format!(
@ -323,7 +323,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&[ .args([
"bash", "bash",
"-c", "-c",
&format!( &format!(
@ -337,7 +337,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&["sudo", "-u", "aur"]) .args(["sudo", "-u", "aur"])
.args(&command.aur_helper.install_command) .args(&command.aur_helper.install_command)
.args(aur_pacakges) .args(aur_pacakges)
.run() .run()
@ -347,7 +347,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&["userdel", "-r", "aur"]) .args(["userdel", "-r", "aur"])
.run() .run()
.context("Failed to delete temporary aur user")?; .context("Failed to delete temporary aur user")?;
@ -413,7 +413,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&["systemctl", "enable", "NetworkManager"]) .args(["systemctl", "enable", "NetworkManager"])
.run() .run()
.context("Failed to enable NetworkManager")?; .context("Failed to enable NetworkManager")?;
@ -433,7 +433,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&["mkinitcpio", "-p", "linux61"]) .args(["mkinitcpio", "-p", "linux61"])
.run() .run()
.context("Failed to run mkinitcpio - do you have the base and linux packages installed?")?; .context("Failed to run mkinitcpio - do you have the base and linux packages installed?")?;
@ -444,7 +444,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
.expect("No tool for blkid") .expect("No tool for blkid")
.execute() .execute()
.arg(root_partition_base.path()) .arg(root_partition_base.path())
.args(&["-o", "value", "-s", "UUID"]) .args(["-o", "value", "-s", "UUID"])
.run_text_output() .run_text_output()
.context("Failed to run blkid")?; .context("Failed to run blkid")?;
let trimmed = uuid.trim(); let trimmed = uuid.trim();
@ -467,7 +467,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> {
arch_chroot arch_chroot
.execute() .execute()
.arg(mount_point.path()) .arg(mount_point.path())
.args(&["bash", "-c"]) .args(["bash", "-c"])
.arg(format!("grub-install --target=i386-pc --boot-directory /boot {} && grub-install --target=x86_64-efi --efi-directory /boot --boot-directory /boot --removable && grub-mkconfig -o /boot/grub/grub.cfg", disk_path.display())) .arg(format!("grub-install --target=i386-pc --boot-directory /boot {} && grub-install --target=x86_64-efi --efi-directory /boot --boot-directory /boot --removable && grub-mkconfig -o /boot/grub/grub.cfg", disk_path.display()))
.run().context("Failed to install grub")?; .run().context("Failed to install grub")?;

View File

@ -73,7 +73,7 @@ impl<'t, 'o> EncryptedDevice<'t, 'o> {
} }
} }
impl<'t, 'o> Drop for EncryptedDevice<'t, 'o> { impl Drop for EncryptedDevice<'_, '_> {
fn drop(&mut self) { fn drop(&mut self) {
if self._close().is_err() { if self._close().is_err() {
warn!("Error closing {}", self.name); warn!("Error closing {}", self.name);
@ -81,7 +81,7 @@ impl<'t, 'o> Drop for EncryptedDevice<'t, 'o> {
} }
} }
impl<'t, 'o> BlockDevice for EncryptedDevice<'t, 'o> { impl BlockDevice for EncryptedDevice<'_, '_> {
fn path(&self) -> &Path { fn path(&self) -> &Path {
&self.path &self.path
} }

View File

@ -14,7 +14,7 @@ impl LoopDevice {
let losetup = Tool::find("losetup")?; let losetup = Tool::find("losetup")?;
let output = losetup let output = losetup
.execute() .execute()
.args(&["--find", "-P", "--show"]) .args(["--find", "-P", "--show"])
.arg(file) .arg(file)
.output() .output()
.context("Error creating the image")?; .context("Error creating the image")?;

View File

@ -78,7 +78,7 @@ impl<'a> MountStack<'a> {
} }
} }
impl<'a> Drop for MountStack<'a> { impl Drop for MountStack<'_> {
fn drop(&mut self) { fn drop(&mut self) {
self._umount().ok(); self._umount().ok();
} }

View File

@ -17,7 +17,7 @@ impl<'a> Partition<'a> {
} }
} }
impl<'a> BlockDevice for Partition<'a> { impl BlockDevice for Partition<'_> {
fn path(&self) -> &Path { fn path(&self) -> &Path {
&self.path &self.path
} }

View File

@ -73,10 +73,9 @@ impl<'a> StorageDevice<'a> {
let name = if self let name = if self
.name .name
.chars() .chars()
.rev() .next_back()
.next()
.expect("Storage device name is empty") .expect("Storage device name is empty")
.is_digit(10) .is_ascii_digit()
{ {
format!("{}p{}", self.name, index) format!("{}p{}", self.name, index)
} else { } else {
@ -93,10 +92,10 @@ impl<'a> StorageDevice<'a> {
} }
} }
impl<'a> BlockDevice for StorageDevice<'a> { impl BlockDevice for StorageDevice<'_> {
fn path(&self) -> &Path { fn path(&self) -> &Path {
&self.path &self.path
} }
} }
impl<'a> Origin for StorageDevice<'a> {} impl Origin for StorageDevice<'_> {}

View File

@ -12,7 +12,7 @@ pub fn qemu(command: args::QemuCommand) -> anyhow::Result<()> {
let qemu = Tool::find("qemu-system-x86_64")?; let qemu = Tool::find("qemu-system-x86_64")?;
let mut run = qemu.execute(); let mut run = qemu.execute();
run.args(&[ run.args([
"-m", "-m",
"4G", "4G",
"-netdev", "-netdev",
@ -33,7 +33,7 @@ pub fn qemu(command: args::QemuCommand) -> anyhow::Result<()> {
if PathBuf::from("/dev/kvm").exists() { if PathBuf::from("/dev/kvm").exists() {
debug!("KVM is enabled"); debug!("KVM is enabled");
run.args(&["-enable-kvm", "-cpu", "host"]); run.args(["-enable-kvm", "-cpu", "host"]);
} }
let err = run.exec(); let err = run.exec();