diff --git a/crates/cgp-extra/src/lib.rs b/crates/cgp-extra/src/lib.rs
index f394a398..a345812f 100644
--- a/crates/cgp-extra/src/lib.rs
+++ b/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;
diff --git a/crates/cgp-field/src/types/product.rs b/crates/cgp-field/src/types/product.rs
index 04e197a2..218aaec2 100644
--- a/crates/cgp-field/src/types/product.rs
+++ b/crates/cgp-field/src/types/product.rs
@@ -47,4 +47,5 @@ pub struct π
(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;
diff --git a/crates/cgp-field/src/types/sum.rs b/crates/cgp-field/src/types/sum.rs
index 5f045144..3aab93f5 100644
--- a/crates/cgp-field/src/types/sum.rs
+++ b/crates/cgp-field/src/types/sum.rs
@@ -59,4 +59,5 @@ pub enum σ {
#[derive(Eq, PartialEq, Debug, Clone)]
pub enum θ {}
-pub use {θ as Void, σ as Either};
+pub use θ as Void;
+pub use σ as Either;
diff --git a/crates/cgp-macro-lib/src/derive_getter/getter_field.rs b/crates/cgp-macro-lib/src/derive_getter/getter_field.rs
index 547b9c17..d300d81c 100644
--- a/crates/cgp-macro-lib/src/derive_getter/getter_field.rs
+++ b/crates/cgp-macro-lib/src/derive_getter/getter_field.rs
@@ -17,7 +17,7 @@ pub enum FieldMode {
OptionRef,
MRef,
Str,
- Clone,
+ Copy,
Slice,
}
diff --git a/crates/cgp-macro-lib/src/derive_getter/method.rs b/crates/cgp-macro-lib/src/derive_getter/method.rs
index 899ca29e..0ec82fce 100644
--- a/crates/cgp-macro-lib/src/derive_getter/method.rs
+++ b/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()
}
diff --git a/crates/cgp-macro-lib/src/derive_getter/parse.rs b/crates/cgp-macro-lib/src/derive_getter/parse.rs
index 8f272b94..bfac7468 100644
--- a/crates/cgp-macro-lib/src/derive_getter/parse.rs
+++ b/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(
diff --git a/crates/cgp-tests/tests/cgp_fn_tests/extend.rs b/crates/cgp-tests/tests/cgp_fn_tests/extend.rs
index d8d52697..172729fa 100644
--- a/crates/cgp-tests/tests/cgp_fn_tests/extend.rs
+++ b/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