Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

image: impl From<MediaType> for String #146

Merged
merged 2 commits into from
Oct 4, 2023
Merged

image: impl From<MediaType> for String #146

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
382d7f5
image: impl From<MediaType> for String
waynr Sep 28, 2023
867ff92
obey rustfmt
waynr Oct 1, 2023
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
27 changes: 27 additions & 0 deletions src/image/mod.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -125,6 +125,33 @@ impl From<&str> for MediaType {
}
}

impl From<MediaType> for String {
fn from(media_type: MediaType) -> Self {
match media_type {
MediaType::Descriptor => "application/vnd.oci.descriptor".to_string(),
MediaType::LayoutHeader => "application/vnd.oci.layout.header.v1+json".to_string(),
MediaType::ImageManifest => "application/vnd.oci.image.manifest.v1+json".to_string(),
MediaType::ImageIndex => "application/vnd.oci.image.index.v1+json".to_string(),
MediaType::ImageLayer => "application/vnd.oci.image.layer.v1.tar".to_string(),
MediaType::ImageLayerGzip => "application/vnd.oci.image.layer.v1.tar+gzip".to_string(),
MediaType::ImageLayerZstd => "application/vnd.oci.image.layer.v1.tar+zstd".to_string(),
MediaType::ImageLayerNonDistributable => {
"application/vnd.oci.image.layer.nondistributable.v1.tar".to_string()
}
MediaType::ImageLayerNonDistributableGzip => {
"application/vnd.oci.image.layer.nondistributable.v1.tar+gzip".to_string()
}
MediaType::ImageLayerNonDistributableZstd => {
"application/vnd.oci.image.layer.nondistributable.v1.tar+zstd".to_string()
}
MediaType::ImageConfig => "application/vnd.oci.image.config.v1+json".to_string(),
MediaType::ArtifactManifest => "application/vnd.oci.artifact.manifest.v1+json".to_string(),
MediaType::EmptyJSON => "application/vnd.oci.empty.v1+json".to_string(),
MediaType::Other(media) => media.to_string(),
}
}
}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We have to apply rustfmt here:

diff --git a/src/image/mod.rs b/src/image/mod.rs
index 7c069c7..571e10c 100644
--- a/src/image/mod.rs
+++ b/src/image/mod.rs
@@ -145,7 +145,[9](https://github.com/containers/oci-spec-rs/actions/runs/6334296245/job/17203694086?pr=146#step:3:10) @@ impl From<MediaType> for String {
                 "application/vnd.oci.image.layer.nondistributable.v1.tar+zstd".to_string()
             }
             MediaType::ImageConfig => "application/vnd.oci.image.config.v1+json".to_string(),
-            MediaType::ArtifactManifest => "application/vnd.oci.artifact.manifest.v1+json".to_string(),
+            MediaType::ArtifactManifest => {
+                "application/vnd.oci.artifact.manifest.v1+json".to_string()
+            }
             MediaType::EmptyJSON => "application/vnd.oci.empty.v1+json".to_string(),
             MediaType::Other(media) => media.to_string(),
         }


/// Trait to get the Docker Image Manifest V2 Schema 2 media type for an OCI media type
///
/// This may be necessary for compatibility with tools that do not recognize the OCI media types.
Expand Down
Loading