diff --git a/Cargo.toml b/Cargo.toml index d1762dd159..6a68f2bc1f 100644 --- a/Cargo.toml +++ b/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "oci-spec" -version = "0.6.4" +version = "0.6.5" edition = "2021" authors = [ "Furisto", diff --git a/README.md b/README.md index c45f89d8a1..98afe1e986 100644 --- a/README.md +++ b/README.md @@ -19,7 +19,7 @@ This library provides a convenient way to interact with the specifications defin ```toml [dependencies] -oci-spec = "0.6.4" +oci-spec = "0.6.5" ``` *Compiler support: requires rustc 1.54+* diff --git a/hack/release b/hack/release index d178bc8d4e..eebb94624a 100755 --- a/hack/release +++ b/hack/release @@ -20,12 +20,14 @@ VERSION_DEV_FILES=( for FILE in "${VERSION_DEV_FILES[@]}"; do sed -Ei "s/^(pub const VERSION_DEV: &str = ).*/\1\"\";/g" "$FILE" + sed -Ei 's/(assert_eq!\(version\(\), "[0-9]+\.[0-9]+\.[0-9]+).*("\.to_string\(\)\))/\1\2/g' "$FILE" done git add . git commit -sm "Bump to $VERSION" for FILE in "${VERSION_DEV_FILES[@]}"; do sed -Ei "s/^(pub const VERSION_DEV: &str = ).*/\1\"-dev\";/g" "$FILE" + sed -Ei 's/(assert_eq!\(version\(\), "[0-9]+\.[0-9]+\.[0-9]+).*("\.to_string\(\)\))/\1-dev\2/g' "$FILE" done git add . git commit -sm "Back to dev" diff --git a/src/image/config.rs b/src/image/config.rs index b16557015e..cb42d28885 100644 --- a/src/image/config.rs +++ b/src/image/config.rs @@ -490,7 +490,7 @@ mod tests { use std::{fs, path::PathBuf}; use super::*; - use crate::image::{Os, ANNOTATION_CREATED, ANNOTATION_VERSION}; + use crate::image::{ANNOTATION_CREATED, ANNOTATION_VERSION}; fn create_base_config() -> ConfigBuilder { ConfigBuilder::default() diff --git a/src/image/descriptor.rs b/src/image/descriptor.rs index 1a66593fe6..5e36e372cc 100644 --- a/src/image/descriptor.rs +++ b/src/image/descriptor.rs @@ -150,7 +150,6 @@ impl Descriptor { #[cfg(test)] mod tests { use super::*; - use crate::image::Descriptor; #[test] fn test_deserialize() { diff --git a/src/image/manifest.rs b/src/image/manifest.rs index 4cc0e24485..c0135429f2 100644 --- a/src/image/manifest.rs +++ b/src/image/manifest.rs @@ -237,7 +237,7 @@ mod tests { use std::{fs, path::PathBuf}; use super::*; - use crate::image::{Descriptor, DescriptorBuilder}; + use crate::image::DescriptorBuilder; fn create_manifest() -> ImageManifest { use crate::image::SCHEMA_VERSION; diff --git a/src/runtime/linux.rs b/src/runtime/linux.rs index c1e14bf958..a0413f1ed0 100644 --- a/src/runtime/linux.rs +++ b/src/runtime/linux.rs @@ -3,7 +3,7 @@ use crate::error::{oci_error, OciSpecError}; use derive_builder::Builder; use getset::{CopyGetters, Getters, Setters}; use serde::{Deserialize, Serialize}; -use std::{collections::HashMap, convert::TryFrom, path::PathBuf, vec}; +use std::{collections::HashMap, path::PathBuf, vec}; #[derive(Builder, Clone, Debug, Deserialize, Eq, Getters, Setters, PartialEq, Serialize)] #[serde(rename_all = "camelCase")]