chore: add local insta aliases (with_settings) to shorten snaphot n…

…ames

borsh-derive/src/internals/attributes/field/bounds.rs

@@ -29,7 +29,7 @@ pub(crate) static BOUNDS_FIELD_PARSE_MAP: Lazy<BTreeMap<Symbol, Box<ParseFn>>> =
     m
 });
 
-#[derive(Default)]
+#[derive(Default, Clone)]
 pub(crate) struct Bounds {
     pub serialize: Option<Vec<WherePredicate>>,
     pub deserialize: Option<Vec<WherePredicate>>,

borsh-derive/src/internals/attributes/field/mod.rs

@@ -1,5 +1,3 @@
-#![allow(unused)]
-// TODO: remove unused when unsplit is done
 use std::collections::BTreeMap;
 
 use once_cell::sync::Lazy;
@@ -67,7 +65,7 @@ static BORSH_FIELD_PARSE_MAP: Lazy<BTreeMap<Symbol, Box<ParseFn>>> = Lazy::new(|
     m
 });
 
-#[derive(Default)]
+#[derive(Default, Clone)]
 pub(crate) struct Attributes {
     pub bounds: Option<bounds::Bounds>,
     pub serialize_with: Option<syn::ExprPath>,
@@ -229,7 +227,10 @@ mod tests {
         Ok(borsh_attrs.bounds)
     }
 
-    use crate::internals::test_helpers::{debug_print_tokenizable, debug_print_vec_of_tokenizable};
+    use crate::internals::test_helpers::{
+        debug_print_tokenizable, debug_print_vec_of_tokenizable, local_insta_assert_debug_snapshot,
+        local_insta_assert_snapshot,
+    };
 
     use super::{bounds, Attributes};
 
@@ -249,7 +250,7 @@ mod tests {
             Ok(..) => unreachable!("expecting error here"),
             Err(err) => err,
         };
-        insta::assert_debug_snapshot!(err);
+        local_insta_assert_debug_snapshot!(err);
     }
 
     #[test]
@@ -269,8 +270,8 @@ mod tests {
 
         let first_field = &item_struct.fields.into_iter().collect::<Vec<_>>()[0];
         let attrs = parse_bounds(&first_field.attrs).unwrap().unwrap();
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(attrs.serialize));
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(attrs.deserialize));
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(attrs.serialize.clone()));
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(attrs.deserialize));
     }
 
     #[test]
@@ -290,8 +291,8 @@ mod tests {
 
         let first_field = &item_struct.fields.into_iter().collect::<Vec<_>>()[0];
         let attrs = parse_bounds(&first_field.attrs).unwrap().unwrap();
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(attrs.serialize));
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(attrs.deserialize));
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(attrs.serialize.clone()));
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(attrs.deserialize));
     }
 
     #[test]
@@ -310,8 +311,8 @@ mod tests {
 
         let first_field = &item_struct.fields.into_iter().collect::<Vec<_>>()[0];
         let attrs = parse_bounds(&first_field.attrs).unwrap().unwrap();
-        assert_eq!(attrs.serialize.unwrap().len(), 0);
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(attrs.deserialize));
+        assert_eq!(attrs.serialize.as_ref().unwrap().len(), 0);
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(attrs.deserialize));
     }
 
     #[test]
@@ -328,7 +329,7 @@ mod tests {
         let first_field = &item_struct.fields.into_iter().collect::<Vec<_>>()[0];
         let attrs = parse_bounds(&first_field.attrs).unwrap().unwrap();
         assert!(attrs.serialize.is_none());
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(attrs.deserialize));
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(attrs.deserialize));
     }
 
     #[test]
@@ -347,7 +348,7 @@ mod tests {
             Ok(..) => unreachable!("expecting error here"),
             Err(err) => err,
         };
-        insta::assert_debug_snapshot!(err);
+        local_insta_assert_debug_snapshot!(err);
     }
 
     #[test]
@@ -366,7 +367,7 @@ mod tests {
             Ok(..) => unreachable!("expecting error here"),
             Err(err) => err,
         };
-        insta::assert_debug_snapshot!(err);
+        local_insta_assert_debug_snapshot!(err);
     }
 
     #[test]
@@ -385,7 +386,7 @@ mod tests {
             Ok(..) => unreachable!("expecting error here"),
             Err(err) => err,
         };
-        insta::assert_debug_snapshot!(err);
+        local_insta_assert_debug_snapshot!(err);
     }
 
     #[test]
@@ -404,8 +405,8 @@ mod tests {
 
         let first_field = &item_struct.fields.into_iter().collect::<Vec<_>>()[0];
         let attrs = Attributes::parse(&first_field.attrs, false).unwrap();
-        insta::assert_snapshot!(debug_print_tokenizable(attrs.serialize_with));
-        insta::assert_snapshot!(debug_print_tokenizable(attrs.deserialize_with));
+        local_insta_assert_snapshot!(debug_print_tokenizable(attrs.serialize_with.as_ref()));
+        local_insta_assert_snapshot!(debug_print_tokenizable(attrs.deserialize_with));
     }
 
     #[test]
@@ -427,7 +428,7 @@ mod tests {
             Ok(..) => unreachable!("expecting error here"),
             Err(err) => err,
         };
-        insta::assert_debug_snapshot!(err);
+        local_insta_assert_debug_snapshot!(err);
     }
 }
 
@@ -436,8 +437,12 @@ mod tests {
 mod tests_schema {
     use crate::internals::{
         attributes::field::Attributes,
-        test_helpers::{debug_print_tokenizable, debug_print_vec_of_tokenizable},
+        test_helpers::{
+            debug_print_tokenizable, debug_print_vec_of_tokenizable,
+            local_insta_assert_debug_snapshot, local_insta_assert_snapshot,
+        },
     };
+
     use quote::quote;
     use syn::{Attribute, ItemStruct};
 
@@ -466,13 +471,13 @@ mod tests_schema {
         let first_field = &item_struct.fields.into_iter().collect::<Vec<_>>()[0];
 
         let attrs = Attributes::parse(&first_field.attrs, false).unwrap();
-        let bounds = attrs.bounds.unwrap();
+        let bounds = attrs.bounds.clone().unwrap();
         assert!(bounds.serialize.is_none());
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(bounds.deserialize));
-        let schema = attrs.schema.unwrap();
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(schema.params));
-        insta::assert_snapshot!(debug_print_tokenizable(attrs.serialize_with));
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(bounds.deserialize));
         assert!(attrs.deserialize_with.is_none());
+        let schema = attrs.schema.clone().unwrap();
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(schema.params.clone()));
+        local_insta_assert_snapshot!(debug_print_tokenizable(attrs.serialize_with));
     }
 
     #[test]
@@ -493,7 +498,7 @@ mod tests_schema {
 
         let first_field = &item_struct.fields.into_iter().collect::<Vec<_>>()[0];
         let schema_attrs = parse_schema_attrs(&first_field.attrs).unwrap();
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(schema_attrs.unwrap().params));
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(schema_attrs.unwrap().params));
     }
     #[test]
     fn test_schema_params_parsing_error() {
@@ -516,7 +521,7 @@ mod tests_schema {
             Ok(..) => unreachable!("expecting error here"),
             Err(err) => err,
         };
-        insta::assert_debug_snapshot!(err);
+        local_insta_assert_debug_snapshot!(err);
     }
 
     #[test]
@@ -540,7 +545,7 @@ mod tests_schema {
             Ok(..) => unreachable!("expecting error here"),
             Err(err) => err,
         };
-        insta::assert_debug_snapshot!(err);
+        local_insta_assert_debug_snapshot!(err);
     }
 
     #[test]
@@ -561,7 +566,7 @@ mod tests_schema {
 
         let first_field = &item_struct.fields.into_iter().collect::<Vec<_>>()[0];
         let schema_attrs = parse_schema_attrs(&first_field.attrs).unwrap();
-        insta::assert_snapshot!(debug_print_vec_of_tokenizable(schema_attrs.unwrap().params));
+        local_insta_assert_snapshot!(debug_print_vec_of_tokenizable(schema_attrs.unwrap().params));
     }
     #[test]
     fn test_schema_params_parsing3() {
@@ -619,8 +624,8 @@ mod tests_schema {
         let schema = attrs.schema.unwrap();
         let with_funcs = schema.with_funcs.unwrap();
 
-        insta::assert_snapshot!(debug_print_tokenizable(with_funcs.declaration));
-        insta::assert_snapshot!(debug_print_tokenizable(with_funcs.definitions));
+        local_insta_assert_snapshot!(debug_print_tokenizable(with_funcs.declaration.clone()));
+        local_insta_assert_snapshot!(debug_print_tokenizable(with_funcs.definitions));
     }
 
     // both `declaration` and `definitions` have to be specified
@@ -644,6 +649,6 @@ mod tests_schema {
             Ok(..) => unreachable!("expecting error here"),
             Err(err) => err,
         };
-        insta::assert_debug_snapshot!(err);
+        local_insta_assert_debug_snapshot!(err);
     }
 }

borsh-derive/src/internals/attributes/field/schema.rs

@@ -60,7 +60,7 @@ pub struct ParameterOverride {
 }
 
 #[allow(unused)]
-#[derive(Default)]
+#[derive(Default, Clone)]
 pub(crate) struct Attributes {
     pub params: Option<Vec<ParameterOverride>>,
     pub with_funcs: Option<WithFuncs>,

borsh-derive/src/internals/attributes/field/schema/with_funcs.rs

@@ -36,6 +36,7 @@ pub(crate) static WITH_FUNCS_FIELD_PARSE_MAP: Lazy<BTreeMap<Symbol, Box<ParseFn>
         m
     });
 
+#[derive(Clone)]
 pub(crate) struct WithFuncs {
     pub declaration: Option<syn::ExprPath>,
     pub definitions: Option<syn::ExprPath>,

borsh-derive/src/internals/attributes/field/snapshots/borsh_derive__internals__attributes__field__tests__bounds_parsing1.snap → borsh-derive/src/internals/attributes/field/snapshots/bounds_parsing1.snap

@@ -1,6 +1,6 @@
 ---
 source: borsh-derive/src/internals/attributes/field/mod.rs
-expression: debug_print_vec_of_tokenizable(attrs.serialize)
+expression: debug_print_vec_of_tokenizable(attrs.serialize.clone())
 ---
 K : Hash + Eq + Ord
 V : Ord

borsh-derive/src/internals/attributes/field/snapshots/borsh_derive__internals__attributes__field__tests__bounds_parsing2.snap → borsh-derive/src/internals/attributes/field/snapshots/bounds_parsing2.snap

@@ -1,6 +1,6 @@
 ---
 source: borsh-derive/src/internals/attributes/field/mod.rs
-expression: debug_print_vec_of_tokenizable(attrs.serialize)
+expression: debug_print_vec_of_tokenizable(attrs.serialize.clone())
 ---
 K : Hash + Eq + borsh :: ser :: BorshSerialize
 V : borsh :: ser :: BorshSerialize

borsh-derive/src/internals/attributes/field/snapshots/borsh_derive__internals__attributes__field__tests_schema__root_bounds_and_params_combined-2.snap → borsh-derive/src/internals/attributes/field/snapshots/root_bounds_and_params_combined-2.snap

@@ -1,6 +1,6 @@
 ---
 source: borsh-derive/src/internals/attributes/field/mod.rs
-expression: debug_print_vec_of_tokenizable(schema.params)
+expression: debug_print_vec_of_tokenizable(schema.params.clone())
 ---
 T => < T as TraitName > :: Associated
 V => Vec < V >

borsh-derive/src/internals/attributes/field/snapshots/borsh_derive__internals__attributes__field__tests_schema__schema_with_funcs_parsing.snap → borsh-derive/src/internals/attributes/field/snapshots/schema_with_funcs_parsing.snap

@@ -1,6 +1,6 @@
 ---
 source: borsh-derive/src/internals/attributes/field/mod.rs
-expression: debug_print_tokenizable(with_funcs.declaration)
+expression: debug_print_tokenizable(with_funcs.declaration.clone())
 ---
 third_party_impl :: declaration :: < K , V >
 

borsh-derive/src/internals/attributes/field/snapshots/borsh_derive__internals__attributes__field__tests_schema__root_bounds_and_params_combined-3.snap → borsh-derive/src/internals/attributes/field/snapshots/ser_de_with_parsing1.snap

@@ -1,6 +1,6 @@
 ---
 source: borsh-derive/src/internals/attributes/field/mod.rs
-expression: debug_print_tokenizable(attrs.serialize_with)
+expression: debug_print_tokenizable(attrs.serialize_with.as_ref())
 ---
 third_party_impl :: serialize_third_party
 

borsh-derive/src/internals/generics.rs

@@ -1,5 +1,3 @@
-// TODO: remove this unused attribute, when the unsplit is done
-#![allow(unused)]
 use std::collections::{HashMap, HashSet};
 
 use quote::{quote, ToTokens};

borsh-derive/src/internals/test_helpers.rs

@@ -30,3 +30,23 @@ pub fn debug_print_tokenizable<T: ToTokens>(optional: Option<T>) -> String {
     }
     s
 }
+
+macro_rules! local_insta_assert_debug_snapshot {
+    ($value:expr) => {{
+
+        insta::with_settings!({prepend_module_to_snapshot => false}, {
+            insta::assert_debug_snapshot!($value);
+        });
+    }};
+}
+
+macro_rules! local_insta_assert_snapshot {
+    ($value:expr) => {{
+
+        insta::with_settings!({prepend_module_to_snapshot => false}, {
+            insta::assert_snapshot!($value);
+        });
+    }};
+}
+
+pub(crate) use {local_insta_assert_debug_snapshot, local_insta_assert_snapshot};