File tree Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Expand file tree Collapse file tree 4 files changed +4
-4
lines changed Original file line number Diff line number Diff line change @@ -508,7 +508,7 @@ pub(crate) async fn rollback(sysroot: &Storage) -> Result<()> {
508
508
( "MESSAGE_ID" , ROLLBACK_JOURNAL_ID ) ,
509
509
(
510
510
"BOOTC_MANIFEST_DIGEST" ,
511
- & rollback_image. manifest_digest . to_string ( ) ,
511
+ rollback_image. manifest_digest . as_ref ( ) ,
512
512
) ,
513
513
]
514
514
. into_iter ( ) ,
Original file line number Diff line number Diff line change @@ -389,7 +389,7 @@ fn human_render_imagestatus(
389
389
} else {
390
390
writeln ! ( out, "{version}" ) ?;
391
391
}
392
- } else if let Some ( timestamp) = timestamp. as_deref ( ) {
392
+ } else if let Some ( timestamp) = timestamp {
393
393
// Otherwise just output timestamp
394
394
write_row_name ( & mut out, "Timestamp" , prefix_len) ?;
395
395
writeln ! ( out, "{timestamp}" ) ?;
Original file line number Diff line number Diff line change @@ -68,7 +68,7 @@ fn ref_for_blob_digest(d: &str) -> Result<String> {
68
68
69
69
/// Convert e.g. sha256:12345... into `/ostree/container/blob/sha256_2B12345...`.
70
70
fn ref_for_layer ( l : & oci_image:: Descriptor ) -> Result < String > {
71
- ref_for_blob_digest ( & l. digest ( ) . to_string ( ) )
71
+ ref_for_blob_digest ( & l. digest ( ) . as_ref ( ) )
72
72
}
73
73
74
74
/// Convert e.g. sha256:12345... into `/ostree/container/blob/sha256_2B12345...`.
Original file line number Diff line number Diff line change @@ -1256,7 +1256,7 @@ async fn test_container_etc_hardlinked(absolute: bool) -> Result<()> {
1256
1256
#[ tokio:: test]
1257
1257
async fn test_non_ostree ( ) -> Result < ( ) > {
1258
1258
let fixture = NonOstreeFixture :: new_base ( ) ?;
1259
- let ( src_imgref , src_digest) = fixture. export_container ( ) . await ?;
1259
+ let src_digest = fixture. export_container ( ) . await ?. 1 ;
1260
1260
1261
1261
let imgref = fixture. export_container ( ) . await . unwrap ( ) . 0 ;
1262
1262
let imp = fixture. must_import ( & imgref) . await ?;
You can’t perform that action at this time.
0 commit comments