Skip to content

Commit

Permalink
tree: Pass through cargo clippy --fix
Browse files Browse the repository at this point in the history
All the clippy warnings were `--fix`able.

Signed-off-by: Jonathan Lebon <[email protected]>
  • Loading branch information
jlebon committed Nov 1, 2023
1 parent 82a6a5a commit d881220
Show file tree
Hide file tree
Showing 4 changed files with 6 additions and 6 deletions.
2 changes: 1 addition & 1 deletion lib/src/cli.rs
Original file line number Diff line number Diff line change
Expand Up @@ -441,7 +441,7 @@ async fn edit(opts: EditOpts) -> Result<()> {
anyhow::bail!("No changes in current host spec");
}
let new_spec = RequiredHostSpec::from_spec(&new_host.spec)?;
let fetched = pull(repo, &new_spec.image, opts.quiet).await?;
let fetched = pull(repo, new_spec.image, opts.quiet).await?;

// TODO gc old layers here

Expand Down
2 changes: 1 addition & 1 deletion lib/src/deploy.rs
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ pub(crate) async fn stage(
sysroot,
merge_deployment.as_ref(),
stateroot,
&image,
image,
&origin,
)
.await?;
Expand Down
6 changes: 3 additions & 3 deletions lib/src/install.rs
Original file line number Diff line number Diff line change
Expand Up @@ -1091,10 +1091,10 @@ pub(crate) async fn install_to_filesystem(opts: InstallToFilesystemOpts) -> Resu
let rootarg = format!("root={root_mount_spec}");
let boot = if let Some(spec) = fsopts.boot_mount_spec {
Some(MountSpec::new(&spec, "/boot"))
} else if let Some(boot_uuid) = boot_uuid.as_deref() {
Some(MountSpec::new_uuid_src(&boot_uuid, "/boot"))
} else {
None
boot_uuid
.as_deref()
.map(|boot_uuid| MountSpec::new_uuid_src(boot_uuid, "/boot"))
};
// By default, we inject a boot= karg because things like FIPS compliance currently
// require checking in the initramfs.
Expand Down
2 changes: 1 addition & 1 deletion lib/src/install/baseline.rs
Original file line number Diff line number Diff line change
Expand Up @@ -372,7 +372,7 @@ pub(crate) fn install_create_rootfs(
.run()?;
let efifs_path = bootfs.join(crate::bootloader::EFI_DIR);
std::fs::create_dir(&efifs_path).context("Creating efi dir")?;
mount::mount(&espdev, &efifs_path)?;
mount::mount(espdev, &efifs_path)?;
}

let luks_device = match opts.block_setup {
Expand Down

0 comments on commit d881220

Please sign in to comment.