reduce amount of copies in derive macro, general lint fixes

Author: knickish

derive/src/difference.rs

@@ -173,23 +173,23 @@ impl Data {
 }
 
 impl Generic {
-    pub fn full(&self) -> String {
+    pub fn full(&self) -> &str {
         match &self {
-            Generic::Const { name, .. } => name.clone(),
-            Generic::Regular { name, .. } => name.clone(),
-            Generic::Lifetime { name, .. } => name.clone(),
-            Generic::WhereBounded { name, .. } => name.clone(),
+            Generic::Const { name, .. } => name,
+            Generic::Regular { name, .. } => name,
+            Generic::Lifetime { name, .. } => name,
+            Generic::WhereBounded { name, .. } => name,
         }
     }
 
-    fn lifetime_prefix(&self) -> &str {
+    fn lifetime_prefix(&self) -> &'static str {
         match &self {
             Generic::Lifetime { .. } => "\'",
             _ => "",
         }
     }
 
-    fn const_prefix(&self) -> &str {
+    fn const_prefix(&self) -> &'static str {
         match &self {
             Generic::Const { .. } => "const ",
             _ => "",
@@ -1421,7 +1421,7 @@ fn get_all_bounds<T: Iterator<Item = TokenTree> + Clone>(source: &mut Peekable<T
     // let mut generic_bounds = Vec::new();
     // let mut in_type = true;
     while let Some(gen) = next_generic(source) {
-        if already.insert(gen.full()) {
+        if already.insert(gen.full().to_owned()) {
             ret.push(gen);
         } else {
             match (
@@ -1453,7 +1453,7 @@ fn get_all_bounds<T: Iterator<Item = TokenTree> + Clone>(source: &mut Peekable<T
                     panic!("mismatched generic types")
                 }
             }
-        }
+        };
         let Some(_) = next_exact_punct(source, ",") else {
             break;
         };
@@ -1470,7 +1470,7 @@ fn get_all_bounds<T: Iterator<Item = TokenTree> + Clone>(source: &mut Peekable<T
         }
 
         while let Some(gen) = next_generic(source) {
-            if already.insert(gen.full()) {
+            if already.insert(gen.full().to_owned()) {
                 let gen = match gen {
                     Generic::Regular { name, bounds, .. } => Generic::WhereBounded { name, bounds },
                     where_bounded @ Generic::WhereBounded { .. } => where_bounded,

derive/src/parse.rs

@@ -23,7 +23,7 @@ pub enum CollectionStrategy {
 }
 
 #[cfg(feature = "generated_setters")]
-pub fn attrs_setter(attributes: &[crate::parse::Attribute]) -> (bool, bool, Option<String>) {
+pub fn attrs_setter(attributes: &[crate::parse::Attribute]) -> (bool, bool, Option<&str>) {
     let skip = attributes
         .iter()
         .any(|attr| attr.tokens.len() == 1 && attr.tokens[0] == "skip_setter");
@@ -33,7 +33,7 @@ pub fn attrs_setter(attributes: &[crate::parse::Attribute]) -> (bool, bool, Opti
 
     let Some(name_override) = attributes.iter().find_map(|attr| {
         if attr.tokens.len() == 2 && attr.tokens[0] == "setter_name" {
-            Some(attr.tokens[1].clone())
+            Some(&attr.tokens[1])
         } else {
             None
         }
@@ -87,7 +87,7 @@ pub fn attrs_collection_type(attributes: &[crate::parse::Attribute]) -> Option<C
 pub fn attrs_map_strategy(attributes: &[crate::parse::Attribute]) -> Option<MapStrategy> {
     attributes.iter().find_map(|attr| {
         if attr.tokens.len() == 2 && attr.tokens[0] == "map_equality" {
-            let strategy = match attr.tokens[1].clone().as_str() {
+            let strategy = match attr.tokens[1].as_str() {
                 "key_only" => MapStrategy::KeyOnly,
                 "key_and_value" => MapStrategy::KeyAndValue,
                 _ => {
@@ -101,10 +101,10 @@ pub fn attrs_map_strategy(attributes: &[crate::parse::Attribute]) -> Option<MapS
     })
 }
 
-pub fn attrs_expose(attributes: &[crate::parse::Attribute]) -> Option<Option<String>> {
+pub fn attrs_expose(attributes: &[crate::parse::Attribute]) -> Option<Option<&str>> {
     attributes.iter().find_map(|attr| match attr.tokens.len() {
         1 if attr.tokens[0].starts_with("expose") => Some(None),
-        2.. if attr.tokens[0] == "expose" => Some(Some(attr.tokens[1].to_string())),
+        2.. if attr.tokens[0] == "expose" => Some(Some(attr.tokens[1].as_str())),
         _ => None,
     })
 }

derive/src/shared.rs

@@ -0,0 +1,6 @@
+fmt:
+    cargo fmt && cargo fmt --manifest-path ./derive/Cargo.toml
+clippy:
+    cargo clippy --all-features && cargo clippy --all-features --manifest-path ./derive/Cargo.toml
+test:
+    cargo test && cargo test --all-features

justfile

@@ -174,6 +174,7 @@ fn create_full_change_table<T: PartialEq>(
         entry[0] = ChangeInternal::Insert(i * INSERT_COST);
     }
 
+    #[allow(clippy::needless_range_loop)]
     for j in 0..=source.len() {
         table[0][j] = ChangeInternal::Delete(j * DELETE_COST)
     }

src/collections/ordered_array_like.rs

@@ -30,7 +30,7 @@ pub struct TestDeriveAll<
     [i32; N]: Default,
     [B; N]: Default,
     dyn Fn(&B): PartialEq + Clone + core::fmt::Debug,
-    (dyn core::fmt::Debug + Send + 'static): Debug,
+    dyn core::fmt::Debug + Send + 'static: Debug,
 {
     f1: (),
     f2: [A; N],

tests/derives.rs

@@ -6,8 +6,9 @@ use std::{
     fmt::Debug,
     num::Wrapping,
 };
-use structdiff::{Difference, StructDiff};
+use structdiff::Difference;
 
+#[allow(dead_code)]
 #[cfg_attr(feature = "serde", derive(Serialize, Deserialize))]
 #[derive(Debug, PartialEq, Clone, Difference, Default)]
 #[difference(setters)]
@@ -19,6 +20,7 @@ pub struct Test {
     pub test5: Option<usize>,
 }
 
+#[allow(dead_code)]
 #[derive(Debug, PartialEq, Clone, Difference)]
 #[difference(setters)]
 pub struct TestSkip<A>

tests/enums.rs

@@ -6,6 +6,7 @@ use nanorand::{Rng, WyRand};
 use nanoserde::{DeBin, SerBin};
 #[cfg(feature = "serde")]
 use serde::{Deserialize, Serialize};
+#[cfg_attr(not(feature = "generated_setters"), expect(unused_imports))]
 use structdiff::{Difference, StructDiff};
 
 pub trait RandValue
@@ -96,6 +97,7 @@ impl RandValue for TestEnum {
 
 #[derive(Difference, Default, PartialEq, Debug, Clone)]
 #[difference(setters)]
+#[allow(unused)]
 pub struct TestSetters {
     #[difference(setter_name = "testing123", recurse)]
     pub f0: Test,