Remove blanket implementation of HasField

crates/cgp-field/src/traits/has_field.rs

@@ -1,5 +1,4 @@
 use core::marker::PhantomData;
-use core::ops::Deref;
 
 use cgp_component::UseContext;
 
@@ -59,19 +58,6 @@ pub trait FieldGetter<Context, Tag> {
     fn get_field(context: &Context, _tag: PhantomData<Tag>) -> &Self::Value;
 }
 
-#[diagnostic::do_not_recommend]
-impl<Context, Tag, Target, Value> HasField<Tag> for Context
-where
-    Context: DerefMap<Target = Target>,
-    Target: HasField<Tag, Value = Value>,
-{
-    type Value = Value;
-
-    fn get_field(&self, tag: PhantomData<Tag>) -> &Self::Value {
-        self.map_deref(|context| context.get_field(tag))
-    }
-}
-
 impl<Context, Tag, Field> FieldGetter<Context, Tag> for UseContext
 where
     Context: HasField<Tag, Value = Field>,
@@ -83,20 +69,24 @@ where
     }
 }
 
-/**
-   A helper trait to help organize the lifetime inference in Rust.
-   Without this, `Self::Target` would need to be `'static`, as Rust couldn't
-   infer the correct lifetime when calling `context.deref().get_field()`.
-*/
-trait DerefMap: Deref {
-    fn map_deref<T>(&self, mapper: impl for<'a> FnOnce(&'a Self::Target) -> &'a T) -> &T;
+impl<Context, Tag, Value> HasField<Tag> for &Context
+where
+    Context: HasField<Tag, Value = Value>,
+{
+    type Value = Value;
+
+    fn get_field(&self, tag: PhantomData<Tag>) -> &Self::Value {
+        Context::get_field(self, tag)
+    }
 }
 
-impl<Context> DerefMap for Context
+impl<Context, Tag, Value> HasField<Tag> for &mut Context
 where
-    Context: Deref,
+    Context: HasField<Tag, Value = Value>,
 {
-    fn map_deref<T>(&self, mapper: impl for<'a> FnOnce(&'a Self::Target) -> &'a T) -> &T {
-        mapper(self.deref())
+    type Value = Value;
+
+    fn get_field(&self, tag: PhantomData<Tag>) -> &Self::Value {
+        Context::get_field(self, tag)
     }
 }

crates/cgp-field/src/traits/has_field_mut.rs

@@ -1,5 +1,4 @@
 use core::marker::PhantomData;
-use core::ops::DerefMut;
 
 use crate::traits::{FieldGetter, HasField};
 
@@ -15,13 +14,11 @@ pub trait MutFieldGetter<Context, Tag>: FieldGetter<Context, Tag> {
     fn get_field_mut(context: &mut Context, tag: PhantomData<Tag>) -> &mut Self::Value;
 }
 
-#[diagnostic::do_not_recommend]
-impl<Context, Tag, Target, Value> HasFieldMut<Tag> for Context
+impl<Context, Tag, Value> HasFieldMut<Tag> for &mut Context
 where
-    Context: DerefMut<Target = Target>,
-    Target: HasFieldMut<Tag, Value = Value> + 'static,
+    Context: HasFieldMut<Tag, Value = Value>,
 {
     fn get_field_mut(&mut self, tag: PhantomData<Tag>) -> &mut Self::Value {
-        self.deref_mut().get_field_mut(tag)
+        Context::get_field_mut(self, tag)
     }
 }

crates/cgp-tests/src/tests/has_field/forward_inner.rs

@@ -0,0 +1,78 @@
+use cgp::prelude::*;
+
+#[derive(HasField)]
+pub struct Foo {
+    pub foo_value: String,
+    pub bar: Bar,
+}
+
+#[derive(HasField)]
+pub struct Bar {
+    pub bar_value: u64,
+    pub baz: Baz,
+}
+
+#[derive(HasField)]
+pub struct Baz {
+    pub baz_value: i32,
+}
+
+impl<Tag, Value> HasField<Tag> for Foo
+where
+    Bar: HasField<Tag, Value = Value>,
+{
+    type Value = Value;
+
+    fn get_field(&self, tag: PhantomData<Tag>) -> &Self::Value {
+        self.bar.get_field(tag)
+    }
+}
+
+impl<Tag, Value> HasField<Tag> for Bar
+where
+    Baz: HasField<Tag, Value = Value>,
+{
+    type Value = Value;
+
+    fn get_field(&self, tag: PhantomData<Tag>) -> &Self::Value {
+        self.baz.get_field(tag)
+    }
+}
+
+#[cgp_auto_getter]
+pub trait HasFooValue {
+    fn foo_value(&self) -> &str;
+}
+
+#[cgp_auto_getter]
+pub trait HasBarValue {
+    fn bar_value(&self) -> u64;
+}
+
+#[cgp_auto_getter]
+pub trait HasBazValue {
+    fn baz_value(&self) -> i32;
+}
+
+#[test]
+fn test_bulk_forward_has_field() {
+    let context = Foo {
+        foo_value: "hello".to_owned(),
+        bar: Bar {
+            bar_value: 42,
+            baz: Baz { baz_value: 128 },
+        },
+    };
+
+    assert_eq!(
+        context.get_field(PhantomData::<Symbol!("foo_value")>),
+        "hello"
+    );
+    assert_eq!(context.foo_value(), "hello");
+
+    assert_eq!(context.get_field(PhantomData::<Symbol!("bar_value")>), &42);
+    assert_eq!(context.bar_value(), 42);
+
+    assert_eq!(context.get_field(PhantomData::<Symbol!("baz_value")>), &128);
+    assert_eq!(context.baz_value(), 128);
+}

crates/cgp-tests/src/tests/has_field/mod.rs

@@ -1,3 +1,4 @@
 pub mod chain;
+pub mod forward_inner;
 pub mod index;
 pub mod life;