diff --git a/lib/src/deploy.rs b/lib/src/deploy.rs index 8e9183c6e..960c1abde 100644 --- a/lib/src/deploy.rs +++ b/lib/src/deploy.rs @@ -508,7 +508,7 @@ pub(crate) async fn rollback(sysroot: &Storage) -> Result<()> { ("MESSAGE_ID", ROLLBACK_JOURNAL_ID), ( "BOOTC_MANIFEST_DIGEST", - &rollback_image.manifest_digest.to_string(), + rollback_image.manifest_digest.as_ref(), ), ] .into_iter(), diff --git a/lib/src/status.rs b/lib/src/status.rs index 8176eeb46..0dc800708 100644 --- a/lib/src/status.rs +++ b/lib/src/status.rs @@ -389,7 +389,7 @@ fn human_render_imagestatus( } else { writeln!(out, "{version}")?; } - } else if let Some(timestamp) = timestamp.as_deref() { + } else if let Some(timestamp) = timestamp { // Otherwise just output timestamp write_row_name(&mut out, "Timestamp", prefix_len)?; writeln!(out, "{timestamp}")?; diff --git a/ostree-ext/src/container/store.rs b/ostree-ext/src/container/store.rs index 3938199c6..d4e4a4fec 100644 --- a/ostree-ext/src/container/store.rs +++ b/ostree-ext/src/container/store.rs @@ -68,7 +68,7 @@ fn ref_for_blob_digest(d: &str) -> Result { /// Convert e.g. sha256:12345... into `/ostree/container/blob/sha256_2B12345...`. fn ref_for_layer(l: &oci_image::Descriptor) -> Result { - ref_for_blob_digest(&l.digest().to_string()) + ref_for_blob_digest(&l.digest().as_ref()) } /// Convert e.g. sha256:12345... into `/ostree/container/blob/sha256_2B12345...`. diff --git a/ostree-ext/tests/it/main.rs b/ostree-ext/tests/it/main.rs index a1fd8138b..97a74f5da 100644 --- a/ostree-ext/tests/it/main.rs +++ b/ostree-ext/tests/it/main.rs @@ -1256,7 +1256,7 @@ async fn test_container_etc_hardlinked(absolute: bool) -> Result<()> { #[tokio::test] async fn test_non_ostree() -> Result<()> { let fixture = NonOstreeFixture::new_base()?; - let (src_imgref, src_digest) = fixture.export_container().await?; + let src_digest = fixture.export_container().await?.1; let imgref = fixture.export_container().await.unwrap().0; let imp = fixture.must_import(&imgref).await?;