Merge branch 'sigp:main' into enum-variant-attributes

Author: Kriskras99

.github/workflows/gh-pages.yml

@@ -8,7 +8,7 @@ on:
 
 jobs:
   deploy:
-    runs-on: ubuntu-20.04
+    runs-on: ubuntu-latest
     concurrency:
       group: ${{ github.workflow }}-${{ github.ref }}
     steps:

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "superstruct"
-version = "0.8.0"
+version = "0.9.0"
 edition = "2021"
 description = "Versioned data types with minimal boilerplate"
 license = "Apache-2.0"

src/lib.rs

@@ -271,7 +271,7 @@ pub fn superstruct(args: TokenStream, input: TokenStream) -> TokenStream {
         let is_common_meta = opts
             .meta_variants
             .as_ref()
-            .map_or(true, |struct_meta_variants| {
+            .is_none_or(|struct_meta_variants| {
                 struct_meta_variants.idents.len() == field_meta_variants.len()
             });
         let is_common = field_variants.len() == variant_names.len() && is_common_meta;
@@ -1178,7 +1178,7 @@ fn is_superstruct_attr(attr: &Attribute) -> bool {
 fn is_attr_with_ident(attr: &Attribute, ident: &str) -> bool {
     attr.path()
         .get_ident()
-        .map_or(false, |attr_ident| *attr_ident == ident)
+        .is_some_and(|attr_ident| *attr_ident == ident)
 }
 
 /// Predicate for determining whether a field should be excluded from a flattened
@@ -1195,7 +1195,7 @@ fn should_skip(
         Override::Inherit => false,
         Override::Explicit(map) => {
             let contains_variant = map.contains_key(variant);
-            let contains_meta_variant = meta_variant.map_or(true, |mv| map.contains_key(mv));
+            let contains_meta_variant = meta_variant.is_none_or(|mv| map.contains_key(mv));
 
             let variants_exist = variant_names.iter().any(|v| map.contains_key(v));
             let meta_variants_exist = meta_variant_names

src/utils.rs

@@ -26,7 +26,7 @@ pub fn snake_case(ident: &str) -> String {
 /// Create a generics block like `<_, _, _>` with `num_generics` underscores.
 pub fn underscore_generics(num_generics: usize) -> proc_macro2::TokenStream {
     let underscore = Token![_](Span::call_site());
-    let underscores = std::iter::repeat(quote! { #underscore }).take(num_generics);
+    let underscores = std::iter::repeat_n(quote! { #underscore }, num_generics);
     quote! { <#(#underscores),*> }
 }
 

tests/basic.rs

@@ -1,3 +1,5 @@
+#![allow(non_local_definitions)] // for macros on structs within test functions
+
 use serde::Deserialize;
 use superstruct::superstruct;
 

tests/flatten.rs

@@ -1,3 +1,5 @@
+#![allow(non_local_definitions)] // for macros on structs within test functions
+
 use superstruct::superstruct;
 
 #[test]

tests/from.rs

@@ -1,3 +1,5 @@
+#![allow(non_local_definitions)] // for macros on structs within test functions
+
 use std::fmt::Display;
 use superstruct::superstruct;
 

tests/map_macro.rs

@@ -1,3 +1,5 @@
+#![allow(non_local_definitions)] // for macros on structs within test functions
+
 use superstruct::superstruct;
 
 #[test]

tests/meta_variant.rs

@@ -1,3 +1,5 @@
+#![allow(non_local_definitions)] // for macros on structs within test functions
+
 use superstruct::superstruct;
 
 #[superstruct(

tests/ref.rs

@@ -1,3 +1,5 @@
+#![allow(non_local_definitions)] // for macros on structs within test functions
+
 use superstruct::superstruct;
 
 // Check that we can convert a Ref to an inner reference with the same lifetime as `message`.

tests/ref_mut.rs

@@ -1,3 +1,5 @@
+#![allow(non_local_definitions)] // for macros on structs within test functions
+
 use superstruct::superstruct;
 
 #[test]

tests/specific_variant_attributes.rs

@@ -1,3 +1,5 @@
+#![allow(non_local_definitions)] // for macros on structs within test functions
+
 use superstruct::superstruct;
 
 #[superstruct(