Merge branch 'main' into feat/roundtrip-tests

Author: razvan

Cargo.lock

@@ -90,6 +90,30 @@ x509-cert = { version = "0.2.5", features = ["builder"] }
 zeroize = "1.8.1"
 
 [workspace.lints.clippy]
+# Enable all pedantic lints (with lower priority so individual lints can override)
+pedantic = { level = "deny", priority = -1 }
+
+# Pedantic lints we don't enforce (yet)
+doc_markdown = "allow"
+missing_errors_doc = "allow"
+must_use_candidate = "allow"
+return_self_not_must_use = "allow"
+missing_panics_doc = "allow"
+cast_possible_truncation = "allow"
+float_cmp = "allow"
+cast_sign_loss = "allow"
+cast_precision_loss = "allow"
+unchecked_time_subtraction = "allow"
+# We should be able to deny this, but it lint's on code generated by darling, raised https://github.com/TedDriggs/darling/pull/429
+needless_continue = "allow"
+
+# Additional nursery lints we enforce
+use_self = "deny"
+or_fun_call = "deny"
+derive_partial_eq_without_eq = "deny"
+unnecessary_struct_initialization = "deny"
+
+# Additional restriction lints we enforce
 unwrap_in_result = "deny"
 unwrap_used = "deny"
 panic = "deny"

Cargo.toml

@@ -18,17 +18,17 @@ mod test {
     use super::*;
     use crate::{Level, Version};
 
-    fn parse_meta(tokens: proc_macro2::TokenStream) -> ::std::result::Result<syn::Meta, String> {
+    fn parse_meta(tokens: &proc_macro2::TokenStream) -> syn::Meta {
         let attribute: syn::Attribute = syn::parse_quote!(#[#tokens]);
-        Ok(attribute.meta)
+        attribute.meta
     }
 
     #[rstest]
     #[case(quote!(ignore = "extensions/v1beta1"), ApiVersion { group: Some("extensions".parse().unwrap()), version: Version { major: 1, level: Some(Level::Beta(1)) } })]
     #[case(quote!(ignore = "v1beta1"), ApiVersion { group: None, version: Version { major: 1, level: Some(Level::Beta(1)) } })]
     #[case(quote!(ignore = "v1"), ApiVersion { group: None, version: Version { major: 1, level: None } })]
     fn from_meta(#[case] input: proc_macro2::TokenStream, #[case] expected: ApiVersion) {
-        let meta = parse_meta(input).expect("valid attribute tokens");
+        let meta = parse_meta(&input);
         let api_version = ApiVersion::from_meta(&meta).expect("version must parse from attribute");
         assert_eq!(api_version, expected);
     }

crates/k8s-version/src/api_version/darling.rs

@@ -12,7 +12,7 @@ mod darling;
 
 /// Error variants which can be encountered when creating a new [`ApiVersion`]
 /// from unparsed input.
-#[derive(Debug, PartialEq, Snafu)]
+#[derive(Debug, PartialEq, Eq, Snafu)]
 pub enum ParseApiVersionError {
     #[snafu(display("failed to parse version"))]
     ParseVersion { source: ParseVersionError },
@@ -87,10 +87,7 @@ impl ApiVersion {
     /// Try to create a new Kubernetes API version based on the unvalidated
     /// `group` string.
     pub fn try_new(group: Option<&str>, version: Version) -> Result<Self, ParseApiVersionError> {
-        let group = group
-            .map(|g| g.parse())
-            .transpose()
-            .context(ParseGroupSnafu)?;
+        let group = group.map(str::parse).transpose().context(ParseGroupSnafu)?;
 
         Ok(Self { group, version })
     }

crates/k8s-version/src/api_version/mod.rs

@@ -12,7 +12,7 @@ static API_GROUP_REGEX: LazyLock<Regex> = LazyLock::new(|| {
 
 /// Error variants which can be encountered when creating a new [`Group`] from
 /// unparsed input.
-#[derive(Debug, PartialEq, Snafu)]
+#[derive(Debug, PartialEq, Eq, Snafu)]
 pub enum ParseGroupError {
     #[snafu(display("group must not be empty"))]
     Empty,