Merge pull request #123 from saschagrunert/clippy

Fix clippy lints

Cargo.toml

@@ -1,7 +1,7 @@
 [package]
 name = "oci-spec"
 version = "0.6.0"
-edition = "2018"
+edition = "2021"
 authors = [
     "Furisto",
     "Sascha Grunert <sgrunert@redhat.com>",

src/distribution/error.rs

@@ -60,7 +60,7 @@ pub struct ErrorResponse {
 
 impl Display for ErrorResponse {
     fn fmt(&self, f: &mut Formatter) -> fmt::Result {
-        write!(f, "{}", ERR_REGISTRY)
+        write!(f, "{ERR_REGISTRY}")
     }
 }
 
@@ -204,7 +204,7 @@ mod tests {
             }
         }"#;
 
-        let error_info: ErrorInfo = serde_json::from_str(&error_info_str)?;
+        let error_info: ErrorInfo = serde_json::from_str(error_info_str)?;
         assert_eq!(error_info.detail().as_ref().unwrap(), "{\"Tag\":\"lates\"}");
 
         Ok(())

src/distribution/version.rs

@@ -12,10 +12,7 @@ pub const VERSION_DEV: &str = "-dev";
 
 /// Retrieve the version as string representation.
 pub fn version() -> String {
-    format!(
-        "{}.{}.{}{}",
-        VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_DEV
-    )
+    format!("{VERSION_MAJOR}.{VERSION_MINOR}.{VERSION_PATCH}{VERSION_DEV}")
 }
 
 #[cfg(test)]

src/image/config.rs

@@ -482,7 +482,7 @@ mod tests {
     use crate::image::Os;
 
     fn create_config() -> ImageConfiguration {
-        let configuration = ImageConfigurationBuilder::default()
+        ImageConfigurationBuilder::default()
             .created("2015-10-31T22:22:56.015925234Z".to_owned())
             .author("Alyssa P. Hacker <alyspdev@example.com>".to_owned())
             .architecture(Arch::Amd64)
@@ -530,9 +530,7 @@ mod tests {
                 .expect("build history"),
             ])
             .build()
-            .expect("build configuration");
-
-        configuration
+            .expect("build configuration")
     }
 
     fn get_config_path() -> PathBuf {
@@ -559,11 +557,11 @@ mod tests {
 
         // act
         let actual = ImageConfiguration::from_reader(&*reader).expect("from reader");
-        println!("{:#?}", actual);
+        println!("{actual:#?}");
 
         // assert
         let expected = create_config();
-        println!("{:#?}", expected);
+        println!("{expected:#?}");
 
         assert_eq!(actual, expected);
     }

src/image/index.rs

@@ -243,13 +243,11 @@ mod tests {
             .build()
             .expect("build amd64 manifest descriptor");
 
-        let index = ImageIndexBuilder::default()
+        ImageIndexBuilder::default()
             .schema_version(SCHEMA_VERSION)
             .manifests(vec![ppc_manifest, amd64_manifest])
             .build()
-            .expect("build image index");
-
-        index
+            .expect("build image index")
     }
 
     fn get_index_path() -> PathBuf {

src/image/manifest.rs

@@ -259,14 +259,12 @@ mod tests {
         })
         .collect();
 
-        let manifest = ImageManifestBuilder::default()
+        ImageManifestBuilder::default()
             .schema_version(SCHEMA_VERSION)
             .config(config)
             .layers(layers)
             .build()
-            .expect("build image manifest");
-
-        manifest
+            .expect("build image manifest")
     }
 
     fn get_manifest_path() -> PathBuf {

src/image/mod.rs

@@ -85,7 +85,7 @@ impl Display for MediaType {
             ),
             Self::ImageConfig => write!(f, "application/vnd.oci.image.config.v1+json"),
             Self::ArtifactManifest => write!(f, "application/vnd.oci.artifact.manifest.v1+json"),
-            Self::Other(media_type) => write!(f, "{}", media_type),
+            Self::Other(media_type) => write!(f, "{media_type}"),
         }
     }
 }
@@ -146,7 +146,7 @@ impl Serialize for MediaType {
     where
         S: serde::Serializer,
     {
-        let media_type = format!("{}", self);
+        let media_type = format!("{self}");
         media_type.serialize(serializer)
     }
 }
@@ -235,7 +235,7 @@ impl Display for Os {
             Os::Other(name) => name,
         };
 
-        write!(f, "{}", print)
+        write!(f, "{print}")
     }
 }
 
@@ -244,7 +244,7 @@ impl Serialize for Os {
     where
         S: serde::Serializer,
     {
-        let os = format!("{}", self);
+        let os = format!("{self}");
         os.serialize(serializer)
     }
 }
@@ -353,7 +353,7 @@ impl Display for Arch {
             Arch::Other(arch) => arch,
         };
 
-        write!(f, "{}", print)
+        write!(f, "{print}")
     }
 }
 
@@ -394,7 +394,7 @@ impl Serialize for Arch {
     where
         S: serde::Serializer,
     {
-        let arch = format!("{}", self);
+        let arch = format!("{self}");
         arch.serialize(serializer)
     }
 }
@@ -433,10 +433,9 @@ mod tests {
     #[test]
     fn test_arch_translation() {
         let a = Arch::default();
-        match a {
-            // If you hit this, please update the mapping above.
-            Arch::Other(o) => panic!("Architecture {} not mapped between Rust and OCI", o),
-            _ => {}
+        // If you hit this, please update the mapping above.
+        if let Arch::Other(o) = a {
+            panic!("Architecture {o} not mapped between Rust and OCI")
         }
     }
 }

src/image/version.rs

@@ -12,10 +12,7 @@ pub const VERSION_DEV: &str = "-dev";
 
 /// Retrieve the version as string representation.
 pub fn version() -> String {
-    format!(
-        "{}.{}.{}{}",
-        VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_DEV
-    )
+    format!("{VERSION_MAJOR}.{VERSION_MINOR}.{VERSION_PATCH}{VERSION_DEV}")
 }
 
 #[cfg(test)]

src/runtime/capability.rs

@@ -567,8 +567,7 @@ impl<'de> Deserialize<'de> for Capability {
             "SYSLOG" => Ok(Self::Syslog),
             "WAKE_ALARM" => Ok(Self::WakeAlarm),
             other => Err(Error::custom(format!(
-                "no variant for {} (converted to {})",
-                input, other,
+                "no variant for {input} (converted to {other})",
             ))),
         }
     }
@@ -589,7 +588,7 @@ mod tests {
     #[test]
     fn deserialize() -> Result<()> {
         for case in &["SYSLOG", "CAP_SYSLOG", "cap_SYSLOG", "sySloG"] {
-            let res: Capability = serde_json::from_str(&format!("\"{}\"", case))?;
+            let res: Capability = serde_json::from_str(&format!("\"{case}\""))?;
             assert_eq!(Capability::Syslog, res);
         }
         Ok(())

src/runtime/linux.rs

@@ -767,8 +767,7 @@ impl TryFrom<&str> for LinuxNamespaceType {
             "pid" => Ok(LinuxNamespaceType::Pid),
             "net" => Ok(LinuxNamespaceType::Network),
             _ => Err(oci_error(format!(
-                "unknown namespace {}, could not convert",
-                namespace
+                "unknown namespace {namespace}, could not convert"
             ))),
         }
     }

src/runtime/test.rs

@@ -35,5 +35,5 @@ fn test_load_sample_spec() {
     let fixture_path = std::path::PathBuf::from(env!("CARGO_MANIFEST_DIR"))
         .join("src/runtime/test/fixture/sample.json");
     let err = Spec::load(fixture_path);
-    assert!(err.is_ok(), "failed to load spec: {:?}", err);
+    assert!(err.is_ok(), "failed to load spec: {err:?}");
 }

src/runtime/version.rs

@@ -12,10 +12,7 @@ pub const VERSION_DEV: &str = "-dev";
 
 /// Retrieve the version as string representation.
 pub fn version() -> String {
-    format!(
-        "{}.{}.{}{}",
-        VERSION_MAJOR, VERSION_MINOR, VERSION_PATCH, VERSION_DEV
-    )
+    format!("{VERSION_MAJOR}.{VERSION_MINOR}.{VERSION_PATCH}{VERSION_DEV}")
 }
 
 #[cfg(test)]