Skip to content
This repository was archived by the owner on Jan 15, 2025. It is now read-only.

Fix clippy lints with cargo 1.60.0-beta.1 (ea2a21c 2022-02-15) #262

Merged
merged 1 commit into from
Mar 8, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions lib/src/container/encapsulate.rs
Original file line number Diff line number Diff line change
Expand Up @@ -124,6 +124,9 @@ fn build_oci(
// Lookup the cmd embedded in commit metadata
let cmd = commit_meta.lookup::<Vec<String>>(ostree::COMMIT_META_CONTAINER_CMD)?;
// But support it being overridden by CLI options

// https://github.com/rust-lang/rust-clippy/pull/7639#issuecomment-1050340564
#[allow(clippy::unnecessary_lazy_evaluations)]
let cmd = config.cmd.as_ref().or_else(|| cmd.as_ref());
if let Some(cmd) = cmd {
ctrcfg.set_cmd(Some(cmd.clone()));
Expand Down
2 changes: 1 addition & 1 deletion lib/src/tar/write.rs
Original file line number Diff line number Diff line change
Expand Up @@ -193,7 +193,7 @@ async fn filter_tar_async(
let copier = tokio::io::copy(&mut rx_buf, &mut dest);
let (r, v) = tokio::join!(tar_transformer, copier);
let _v: u64 = v?;
Ok(r??)
r?
}

/// Write the contents of a tarball as an ostree commit.
Expand Down