Merge pull request #45 from containers/minor

Two followups to previous PR

Author: cgwalters

Cargo.toml

@@ -18,7 +18,8 @@ serde = { features = ["derive"], version = "1.0.125" }
 serde_json = "1.0.64"
 tar = "0.4.38"
 thiserror = "2"
-oci-spec = "0.8.0"
+# See https://github.com/youki-dev/oci-spec-rs/pull/288
+oci-spec = "0.8.2"
 zstd = { version = "0.13.2", optional = true }
 canon-json = "0.2.0"
 

examples/ocidir-import-tar.rs

@@ -42,12 +42,7 @@ fn import(oci_dir: &OciDir, name: &str, src: File) -> anyhow::Result<()> {
         .created_by(name.to_string())
         .build()
         .unwrap();
-    match config.history_mut() {
-        Some(v) => v.push(h),
-        None => {
-            config.set_history(Some(vec![h]));
-        }
-    }
+    config.history_mut().get_or_insert_default().push(h);
 
     println!(
         "Created image with manifest: {}",

src/lib.rs

@@ -429,12 +429,7 @@ impl OciDir {
         } else {
             oci_image::HistoryBuilder::default().build().unwrap()
         };
-        match config.history_mut() {
-            Some(h) => h.push(history),
-            None => {
-                config.set_history(Some(vec![history]));
-            }
-        }
+        config.history_mut().get_or_insert_default().push(history);
     }
 
     /// Add a layer to the top of the image stack with desired history entry.