Use Copy instead of Clone for owned getter field values

crates/cgp-extra/src/lib.rs

@@ -2,7 +2,10 @@
 
 pub mod prelude;
 
-pub use {
-    cgp_dispatch as dispatch, cgp_error_extra as error, cgp_field_extra as field,
-    cgp_handler as handler, cgp_monad as monad, cgp_run as run, cgp_runtime as runtime,
-};
+pub use cgp_dispatch as dispatch;
+pub use cgp_error_extra as error;
+pub use cgp_field_extra as field;
+pub use cgp_handler as handler;
+pub use cgp_monad as monad;
+pub use cgp_run as run;
+pub use cgp_runtime as runtime;

crates/cgp-field/src/types/product.rs

@@ -47,4 +47,5 @@ pub struct π<Head, Tail>(pub Head, pub Tail);
 #[allow(non_camel_case_types)]
 pub struct ε;
 
-pub use {ε as Nil, π as Cons};
+pub use ε as Nil;
+pub use π as Cons;

crates/cgp-field/src/types/sum.rs

@@ -59,4 +59,5 @@ pub enum σ<Head, Tail> {
 #[derive(Eq, PartialEq, Debug, Clone)]
 pub enum θ {}
 
-pub use {θ as Void, σ as Either};
+pub use θ as Void;
+pub use σ as Either;

crates/cgp-macro-lib/src/derive_getter/getter_field.rs

@@ -17,7 +17,7 @@ pub enum FieldMode {
     OptionRef,
     MRef,
     Str,
-    Clone,
+    Copy,
     Slice,
 }
 

crates/cgp-macro-lib/src/derive_getter/method.rs

@@ -117,7 +117,7 @@ pub fn extend_call_expr(
                 }
             }
         }
-        FieldMode::Clone => {
+        FieldMode::Copy => {
             quote! {
                 #call_expr .clone()
             }

crates/cgp-macro-lib/src/derive_getter/parse.rs

@@ -302,7 +302,7 @@ pub fn parse_field_type(
             } else if let (Some(field_type), None) = (try_parse_mref(type_path), receiver_mut) {
                 Ok((field_type.clone(), FieldMode::MRef))
             } else {
-                Ok((return_type.clone(), FieldMode::Clone))
+                Ok((return_type.clone(), FieldMode::Copy))
             }
         }
         _ => Err(Error::new(

crates/cgp-tests/tests/cgp_fn_tests/extend.rs

@@ -15,7 +15,7 @@ pub fn rectangle_area(
     #[implicit] height: Self::Scalar,
 ) -> Self::Scalar
 where
-    Self::Scalar: Mul<Output = Self::Scalar> + Clone,
+    Self::Scalar: Mul<Output = Self::Scalar> + Copy,
 {
     width * height
 }

crates/cgp-tests/tests/cgp_fn_tests/foreign_type.rs

@@ -15,7 +15,7 @@ pub fn rectangle_area<Types: HasScalarType>(
     #[implicit] height: Scalar,
 ) -> Scalar
 where
-    Scalar: Mul<Output = Scalar> + Clone,
+    Scalar: Mul<Output = Scalar> + Copy,
 {
     let res: Scalar = width * height;
     res

crates/cgp-tests/tests/cgp_fn_tests/generics.rs

@@ -9,7 +9,7 @@ pub fn rectangle_area<Scalar>(
     #[implicit] height: Scalar,
 ) -> Scalar
 where
-    Scalar: Mul<Output = Scalar> + Clone,
+    Scalar: Mul<Output = Scalar> + Copy,
 {
     width * height
 }

crates/cgp-tests/tests/cgp_fn_tests/nested_foreign_type.rs

@@ -17,7 +17,7 @@ pub trait HasTypes {
 #[extend_where(Types: HasScalarType)]
 pub fn rectangle_area(&self, #[implicit] width: Scalar, #[implicit] height: Scalar) -> Scalar
 where
-    Scalar: Mul<Output = Scalar> + Clone,
+    Scalar: Mul<Output = Scalar> + Copy,
 {
     let res: Scalar = width * height;
     res

crates/cgp-tests/tests/cgp_fn_tests/use_type.rs

@@ -5,7 +5,7 @@ use cgp::prelude::*;
 
 #[cgp_type]
 pub trait HasScalarType {
-    type Scalar: Mul<Output = Self::Scalar> + Clone;
+    type Scalar: Mul<Output = Self::Scalar> + Copy;
 }
 
 #[cgp_fn]

crates/cgp-tests/tests/cgp_fn_tests/use_type_alias.rs

@@ -11,7 +11,7 @@ pub trait HasScalarType {
 #[use_type(HasScalarType::{Scalar as S})]
 pub fn rectangle_area(&self, #[implicit] width: S, #[implicit] height: S) -> S
 where
-    S: Mul<Output = S> + Clone,
+    S: Mul<Output = S> + Copy,
 {
     let res: S = width * height;
     res

crates/cgp-tests/tests/component_tests/abstract_types/basic.rs

@@ -19,7 +19,7 @@ pub trait CanCalculateArea {
 #[use_type(HasScalarType::Scalar, HasErrorType::Error)]
 impl AreaCalculator
 where
-    Scalar: Mul<Output = Scalar> + Clone,
+    Scalar: Mul<Output = Scalar> + Copy,
 {
     fn area(&self, #[implicit] width: Scalar, #[implicit] height: Scalar) -> Result<Scalar, Error> {
         Ok(width * height)

crates/cgp-tests/tests/component_tests/abstract_types/extend.rs

@@ -19,7 +19,7 @@ pub trait CanCalculateArea {
 #[uses(HasScalarType, HasErrorType)]
 impl AreaCalculator
 where
-    Self::Scalar: Mul<Output = Self::Scalar> + Clone,
+    Self::Scalar: Mul<Output = Self::Scalar> + Copy,
 {
     fn area(
         &self,

crates/cgp-tests/tests/component_tests/abstract_types/foreign.rs

@@ -19,7 +19,7 @@ pub trait CanCalculateArea<Types: HasScalarType> {
 #[use_type(@Types::HasScalarType::Scalar, HasErrorType::Error)]
 impl<Types> AreaCalculator<Types>
 where
-    Scalar: Mul<Output = Scalar> + Clone,
+    Scalar: Mul<Output = Scalar> + Copy,
 {
     fn area(&self, #[implicit] width: Scalar, #[implicit] height: Scalar) -> Result<Scalar, Error> {
         Ok(width * height)

crates/cgp-tests/tests/component_tests/cgp_impl/implicit_args/generics.rs

@@ -3,17 +3,17 @@ use core::ops::Mul;
 use cgp::prelude::*;
 
 #[cgp_component(AreaCalculator)]
-pub trait CanCalculateArea {
-    fn area(&self) -> f64;
+pub trait CanCalculateArea<Scalar> {
+    fn area(&self) -> Scalar;
 }
 
 #[cgp_impl(new RectangleArea)]
-impl<Scalar> AreaCalculator
+impl<Scalar> AreaCalculator<Scalar>
 where
-    Scalar: Mul<Output = Scalar> + Clone + Into<f64>,
+    Scalar: Mul<Output = Scalar> + Copy,
 {
-    fn area(&self, #[implicit] width: Scalar, #[implicit] height: Scalar) -> f64 {
-        (width * height).into()
+    fn area(&self, #[implicit] width: Scalar, #[implicit] height: Scalar) -> Scalar {
+        width * height
     }
 }
 
@@ -23,10 +23,15 @@ pub struct Rectangle {
     pub height: f64,
 }
 
-delegate_and_check_components! {
-    CanUseRectangle for Rectangle;
+delegate_components! {
     Rectangle {
         AreaCalculatorComponent:
             RectangleArea,
     }
 }
+
+check_components! {
+    CanUseRectangle for Rectangle {
+        AreaCalculatorComponent: f64,
+    }
+}

crates/cgp-tests/tests/getter_tests/abstract_type/import.rs

@@ -2,7 +2,7 @@ use cgp::prelude::*;
 
 #[cgp_type]
 pub trait HasScalarType {
-    type Scalar: Clone;
+    type Scalar: Copy;
 }
 
 #[cgp_auto_getter]

crates/cgp-tests/tests/getter_tests/abstract_type/use_type.rs

@@ -2,7 +2,7 @@ use cgp::prelude::*;
 
 #[cgp_type]
 pub trait HasScalarType {
-    type Scalar: Clone;
+    type Scalar: Copy;
 }
 
 #[cgp_auto_getter]

crates/cgp-tests/tests/getter_tests/clone.rs

@@ -8,25 +8,23 @@ pub fn test_clone_getter() {
     }
 
     #[cgp_getter]
-    pub trait HasName: HasNameType<Name: Clone> {
+    pub trait HasName: HasNameType<Name: Copy> {
         fn name(&self) -> Self::Name;
     }
 
     #[derive(HasField)]
     pub struct App {
-        pub name: String,
+        pub name: &'static str,
     }
 
     delegate_components! {
         App {
-            NameTypeProviderComponent: UseType<String>,
+            NameTypeProviderComponent: UseType<&'static str>,
             NameGetterComponent: UseField<Symbol!("name")>,
         }
     }
 
-    let context = App {
-        name: "Alice".to_owned(),
-    };
+    let context = App { name: "Alice" };
 
     assert_eq!(context.name(), "Alice");
 }
@@ -39,24 +37,22 @@ pub fn test_clone_auto_getter() {
     }
 
     #[cgp_auto_getter]
-    pub trait HasName: HasNameType<Name: Clone> {
+    pub trait HasName: HasNameType<Name: Copy> {
         fn name(&self) -> Self::Name;
     }
 
     #[derive(HasField)]
     pub struct App {
-        pub name: String,
+        pub name: &'static str,
     }
 
     delegate_components! {
         App {
-            NameTypeProviderComponent: UseType<String>,
+            NameTypeProviderComponent: UseType<&'static str>,
         }
     }
 
-    let context = App {
-        name: "Alice".to_owned(),
-    };
+    let context = App { name: "Alice" };
 
     assert_eq!(context.name(), "Alice");
 }