Minor refactoring

Author: soareschen

README.md

@@ -2,4 +2,4 @@
 
 ## Overview
 
-This repository contains a context-generic version of the `serde` crate, to support modular serialization using [context-generic programming](https://contextgeneric.dev) (CGP).
+`cgp-serde` provides a context-generic version of the `serde` crate, to support modular serialization using [context-generic programming](https://contextgeneric.dev) (CGP).

crates/cgp-serde-extra/Cargo.toml

@@ -7,7 +7,7 @@ repository   = { workspace = true }
 authors      = { workspace = true }
 rust-version = { workspace = true }
 keywords     = { workspace = true }
-description  = "CGP-enabled serde implementation"
+description  = "Extra providers for Serde serialization of bytes and dates"
 
 [dependencies]
 cgp         = { workspace = true }

crates/cgp-serde-json/src/impls/from_reader.rs

@@ -5,9 +5,8 @@ use serde_json::{Deserializer, Error};
 
 use crate::code::DeserializeJson;
 
-#[cgp_new_provider]
-impl<Context, Value, R, 'de> TryComputer<Context, DeserializeJson<Value>, R>
-    for DeserializeFromJsonReader
+#[cgp_impl(new DeserializeFromJsonReader)]
+impl<Context, Value, R, 'de> TryComputer<DeserializeJson<Value>, R> for Context
 where
     R: Read<'de>,
     Context: CanDeserializeValue<'de, Value> + CanRaiseError<Error>,

crates/cgp-serde-json/src/impls/to_string.rs

@@ -5,8 +5,8 @@ use cgp_serde::components::CanSerializeValue;
 use cgp_serde::types::SerializeWithContext;
 use serde_json::Error;
 
-#[cgp_new_provider]
-impl<Context, Code, Value> TryComputer<Context, Code, &Value> for SerializeToJsonString
+#[cgp_impl(new SerializeToJsonString)]
+impl<Context, Code, Value> TryComputer<Code, &Value> for Context
 where
     Context: CanSerializeValue<Value> + CanRaiseError<Error>,
 {

crates/cgp-serde/src/providers/bytes.rs

@@ -14,7 +14,7 @@ impl<Context, Value> ValueSerializer<Value> for Context
 where
     Value: AsRef<[u8]>,
 {
-    fn serialize<S>(_context: &Context, value: &Value, serializer: S) -> Result<S::Ok, S::Error>
+    fn serialize<S>(&self, value: &Value, serializer: S) -> Result<S::Ok, S::Error>
     where
         S: serde::Serializer,
     {
@@ -27,7 +27,7 @@ impl<'a, Context, Value> ValueDeserializer<'a, Value> for Context
 where
     Value: From<&'a [u8]>,
 {
-    fn deserialize<D>(_context: &Context, deserializer: D) -> Result<Value, D::Error>
+    fn deserialize<D>(&self, deserializer: D) -> Result<Value, D::Error>
     where
         D: serde::Deserializer<'a>,
     {

crates/cgp-serde/src/providers/default.rs

@@ -3,9 +3,8 @@ use serde::de::Visitor;
 
 use crate::components::{ValueDeserializer, ValueDeserializerComponent};
 
-#[cgp_new_provider]
-impl<'a, Context, Value, Provider> ValueDeserializer<'a, Context, Value>
-    for DeserializeDefault<Provider>
+#[cgp_impl(new DeserializeDefault<Provider>)]
+impl<'a, Context, Value, Provider> ValueDeserializer<'a, Value> for Context
 where
     Value: Default,
     Provider: ValueDeserializer<'a, Context, Value>,

crates/cgp-serde/src/providers/deref.rs

@@ -4,8 +4,8 @@ use cgp::prelude::*;
 
 use crate::components::{CanSerializeValue, ValueSerializer, ValueSerializerComponent};
 
-#[cgp_new_provider]
-impl<Context, Value> ValueSerializer<Context, Value> for SerializeDeref
+#[cgp_impl(new SerializeDeref)]
+impl<Context, Value> ValueSerializer<Value> for Context
 where
     Value: Deref,
     Context: CanSerializeValue<Value::Target>,

crates/cgp-serde/src/providers/display.rs

@@ -3,25 +3,26 @@ use core::fmt::Display;
 use core::str::FromStr;
 
 use cgp::prelude::*;
+use serde::Serializer;
 use serde::de::Error;
 
 use crate::components::{
     CanDeserializeValue, CanSerializeValue, ValueDeserializer, ValueDeserializerComponent,
     ValueSerializer, ValueSerializerComponent,
 };
 
-#[cgp_new_provider]
-impl<Context, Value> ValueSerializer<Context, Value> for SerializeWithDisplay
+#[cgp_impl(new SerializeWithDisplay)]
+impl<Context, Value> ValueSerializer<Value> for Context
 where
     Context: CanSerializeValue<String>,
     Value: Display,
 {
-    fn serialize<S>(context: &Context, value: &Value, serializer: S) -> Result<S::Ok, S::Error>
+    fn serialize<S>(&self, value: &Value, serializer: S) -> Result<S::Ok, S::Error>
     where
-        S: serde::Serializer,
+        S: Serializer,
     {
         let str_value = value.to_string();
-        context.serialize(&str_value, serializer)
+        self.serialize(&str_value, serializer)
     }
 }
 

crates/cgp-serde/src/providers/fields.rs

@@ -5,8 +5,8 @@ use serde::ser::SerializeMap;
 use crate::components::{CanSerializeValue, ValueSerializer, ValueSerializerComponent};
 use crate::types::SerializeWithContext;
 
-#[cgp_new_provider]
-impl<Context, Value> ValueSerializer<Context, Value> for SerializeFields
+#[cgp_impl(new SerializeFields)]
+impl<Context, Value> ValueSerializer<Value> for Context
 where
     Value: HasFields,
     Value::Fields: FieldsSerializer<Context, Value>,

crates/cgp-serde/src/providers/iterator.rs

@@ -4,9 +4,7 @@ use serde::ser::SerializeSeq;
 use crate::components::{CanSerializeValue, ValueSerializer, ValueSerializerComponent};
 use crate::types::SerializeWithContext;
 
-pub struct SerializeIterator;
-
-#[cgp_impl(SerializeIterator)]
+#[cgp_impl(new SerializeIterator)]
 impl<Context, Value> ValueSerializer<Value> for Context
 where
     for<'a> &'a Value: IntoIterator,