From fb3808335e0d7923c94832fb5d08171b8b13e508 Mon Sep 17 00:00:00 2001 From: Philip Mueller Date: Thu, 22 Jun 2023 22:59:04 +0200 Subject: [PATCH] [code] try to make clippy happy --- src/main.rs | 26 +++++++++++++------------- src/storage/loop_device.rs | 2 +- src/tool/qemu.rs | 4 ++-- 3 files changed, 16 insertions(+), 16 deletions(-) diff --git a/src/main.rs b/src/main.rs index 8d3298a..a09aa76 100644 --- a/src/main.rs +++ b/src/main.rs @@ -166,7 +166,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { sgdisk .execute() - .args(&[ + .args([ "-Z", "-o", &format!("--new=1::+{}M", boot_size), @@ -175,7 +175,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { "--typecode=1:EF00", "--typecode=2:EF02", ]) - .arg(&disk_path) + .arg(disk_path) .run() .context("Partitioning error")?; @@ -270,7 +270,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .arg(mount_point.path()) - .args(&["passwd", "-d", "root"]) + .args(["passwd", "-d", "root"]) .run() .context("Failed to delete the root password")?; @@ -298,7 +298,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .arg(mount_point.path()) - .args(&["useradd", "-m", "aur"]) + .args(["useradd", "-m", "aur"]) .run() .context("Failed to create temporary user to install AUR packages")?; @@ -309,7 +309,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .arg(mount_point.path()) - .args(&["sudo", "-u", "aur"]) + .args(["sudo", "-u", "aur"]) .arg("git") .arg("clone") .arg(format!( @@ -323,7 +323,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .arg(mount_point.path()) - .args(&[ + .args([ "bash", "-c", &format!( @@ -337,8 +337,8 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .arg(mount_point.path()) - .args(&["sudo", "-u", "aur"]) - .args(&command.aur_helper.install_command) + .args(["sudo", "-u", "aur"]) + .args(command.aur_helper.install_command) .args(aur_pacakges) .run() .context("Failed to install AUR packages")?; @@ -347,7 +347,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .arg(mount_point.path()) - .args(&["userdel", "-r", "aur"]) + .args(["userdel", "-r", "aur"]) .run() .context("Failed to delete temporary aur user")?; @@ -413,7 +413,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .arg(mount_point.path()) - .args(&["systemctl", "enable", "NetworkManager"]) + .args(["systemctl", "enable", "NetworkManager"]) .run() .context("Failed to enable NetworkManager")?; @@ -433,7 +433,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .arg(mount_point.path()) - .args(&["mkinitcpio", "-P"]) + .args(["mkinitcpio", "-P"]) .run() .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") .execute() .arg(root_partition_base.path()) - .args(&["-o", "value", "-s", "UUID"]) + .args(["-o", "value", "-s", "UUID"]) .run_text_output() .context("Failed to run blkid")?; let trimmed = uuid.trim(); @@ -467,7 +467,7 @@ fn create(command: args::CreateCommand) -> anyhow::Result<()> { arch_chroot .execute() .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())) .run().context("Failed to install grub")?; diff --git a/src/storage/loop_device.rs b/src/storage/loop_device.rs index d63cca2..62546d1 100644 --- a/src/storage/loop_device.rs +++ b/src/storage/loop_device.rs @@ -14,7 +14,7 @@ impl LoopDevice { let losetup = Tool::find("losetup")?; let output = losetup .execute() - .args(&["--find", "-P", "--show"]) + .args(["--find", "-P", "--show"]) .arg(file) .output() .context("Error creating the image")?; diff --git a/src/tool/qemu.rs b/src/tool/qemu.rs index a220f7d..f5938cf 100644 --- a/src/tool/qemu.rs +++ b/src/tool/qemu.rs @@ -12,7 +12,7 @@ pub fn qemu(command: args::QemuCommand) -> anyhow::Result<()> { let qemu = Tool::find("qemu-system-x86_64")?; let mut run = qemu.execute(); - run.args(&[ + run.args([ "-m", "4G", "-netdev", @@ -33,7 +33,7 @@ pub fn qemu(command: args::QemuCommand) -> anyhow::Result<()> { if PathBuf::from("/dev/kvm").exists() { debug!("KVM is enabled"); - run.args(&["-enable-kvm", "-cpu", "host"]); + run.args(["-enable-kvm", "-cpu", "host"]); } let err = run.exec();