Removed Decoder type from Patch trait

Author: gammelalf

rorm-macro-impl/src/generate/patch.rs

@@ -1,8 +1,8 @@
 use std::array;
 
-use proc_macro2::{Ident, Span, TokenStream};
+use proc_macro2::{Ident, TokenStream};
 use quote::{format_ident, quote, ToTokens};
-use syn::{Generics, LitStr, Type, Visibility};
+use syn::{Generics, Type, Visibility};
 
 use crate::parse::patch::ParsedPatch;
 use crate::MacroConfig;
@@ -71,10 +71,6 @@ pub fn partially_generate_patch<'a>(
     let value_space_marker_impl = format_ident!("__{patch}_ValueSpaceImplMarker");
 
     let decoder = format_ident!("__{patch}_Decoder");
-    let decoder_doc = LitStr::new(
-        &format!("[`Decoder`]({rorm_path}::crud::decoder::Decoder) for [`{patch}`]",),
-        Span::call_site(),
-    );
 
     let [fields_1, fields_2, fields_3, fields_4, fields_5, fields_6, fields_7] =
         array::from_fn(|_| fields.clone());
@@ -105,7 +101,7 @@ pub fn partially_generate_patch<'a>(
         }
         #vis use #value_space_impl::*;
 
-        #[doc = #decoder_doc]
+        #[doc(hidden)]
         #vis struct #decoder #impl_generics #where_clause {
             #(
                 #fields_1: <#types as #rorm_path::fields::traits::FieldType>::Decoder,
@@ -151,8 +147,6 @@ pub fn partially_generate_patch<'a>(
 
             type ValueSpaceImpl = #value_space_impl #type_generics;
 
-            type Decoder = #decoder #type_generics;
-
             fn push_columns(columns: &mut Vec<&'static str>) {#(
                 columns.extend(
                     #rorm_path::fields::proxy::columns(|| <<Self as #rorm_path::model::Patch>::Model as #rorm_path::model::Model>::FIELDS.#fields_5)

src/model.rs

@@ -3,7 +3,6 @@
 use rorm_declaration::imr;
 
 use crate::conditions::{Binary, BinaryOperator, Column, Value};
-use crate::crud::decoder::Decoder;
 use crate::crud::selector::Selector;
 use crate::fields::proxy;
 use crate::internal::field::{Field, SingleColumnField};
@@ -22,9 +21,6 @@ pub trait Patch: Sized + 'static {
     /// This is more of an implementation detail of the derive macro.
     type ValueSpaceImpl: Selector<Result = Self, Model = Self::Model> + Default;
 
-    /// [`Decoder`] returned by [`Patch::select`] which decodes this patch from a row
-    type Decoder: Decoder<Result = Self>;
-
     /// Create a `Vec` containing the patch's columns
     fn columns() -> Vec<&'static str> {
         let mut columns = Vec::new();

tests/data/derives/basic_expansions/BasicModel.rs

@@ -86,7 +86,7 @@ pub enum __BasicModel_ValueSpaceImpl {
     __BasicModel_ValueSpaceImplMarker(::std::marker::PhantomData<BasicModel>),
 }
 pub use __BasicModel_ValueSpaceImpl::*;
-///[`Decoder`](:: rorm::crud::decoder::Decoder) for [`BasicModel`]
+#[doc(hidden)]
 pub struct __BasicModel_Decoder {
     id: <i64 as ::rorm::fields::traits::FieldType>::Decoder,
 }
@@ -131,7 +131,6 @@ impl ::rorm::crud::decoder::Decoder for __BasicModel_Decoder {
 impl ::rorm::model::Patch for BasicModel {
     type Model = BasicModel;
     type ValueSpaceImpl = __BasicModel_ValueSpaceImpl;
-    type Decoder = __BasicModel_Decoder;
     fn push_columns(columns: &mut Vec<&'static str>) {
         columns
             .extend(

tests/data/derives/basic_expansions/BasicPatch.rs

@@ -7,7 +7,7 @@ pub enum __BasicPatch_ValueSpaceImpl {
     __BasicPatch_ValueSpaceImplMarker(::std::marker::PhantomData<BasicPatch>),
 }
 pub use __BasicPatch_ValueSpaceImpl::*;
-///[`Decoder`](:: rorm::crud::decoder::Decoder) for [`BasicPatch`]
+#[doc(hidden)]
 pub struct __BasicPatch_Decoder {}
 impl ::rorm::crud::selector::Selector for __BasicPatch_ValueSpaceImpl {
     type Result = BasicPatch;
@@ -44,7 +44,6 @@ impl ::rorm::crud::decoder::Decoder for __BasicPatch_Decoder {
 impl ::rorm::model::Patch for BasicPatch {
     type Model = BasicModel;
     type ValueSpaceImpl = __BasicPatch_ValueSpaceImpl;
-    type Decoder = __BasicPatch_Decoder;
     fn push_columns(columns: &mut Vec<&'static str>) {}
     fn push_references<'a>(&'a self, values: &mut Vec<::rorm::conditions::Value<'a>>) {}
     fn push_values(self, values: &mut Vec<::rorm::conditions::Value>) {}

tests/data/derives/experimental_expansions/Generic.rs

@@ -136,7 +136,7 @@ pub enum __Generic_ValueSpaceImpl<X: rorm::fields::traits::FieldType> {
     __Generic_ValueSpaceImplMarker(::std::marker::PhantomData<Generic<X>>),
 }
 pub use __Generic_ValueSpaceImpl::*;
-///[`Decoder`](:: rorm::crud::decoder::Decoder) for [`Generic`]
+#[doc(hidden)]
 pub struct __Generic_Decoder<X: rorm::fields::traits::FieldType> {
     id: <i64 as ::rorm::fields::traits::FieldType>::Decoder,
     x: <X as ::rorm::fields::traits::FieldType>::Decoder,
@@ -188,7 +188,6 @@ for __Generic_Decoder<X> {
 impl<X: rorm::fields::traits::FieldType> ::rorm::model::Patch for Generic<X> {
     type Model = Generic<X>;
     type ValueSpaceImpl = __Generic_ValueSpaceImpl<X>;
-    type Decoder = __Generic_Decoder<X>;
     fn push_columns(columns: &mut Vec<&'static str>) {
         columns
             .extend(

tests/data/derives/experimental_expansions/Unregistered.rs

@@ -81,7 +81,7 @@ pub enum __Unregistered_ValueSpaceImpl {
     __Unregistered_ValueSpaceImplMarker(::std::marker::PhantomData<Unregistered>),
 }
 pub use __Unregistered_ValueSpaceImpl::*;
-///[`Decoder`](:: rorm::crud::decoder::Decoder) for [`Unregistered`]
+#[doc(hidden)]
 pub struct __Unregistered_Decoder {
     id: <i64 as ::rorm::fields::traits::FieldType>::Decoder,
 }
@@ -126,7 +126,6 @@ impl ::rorm::crud::decoder::Decoder for __Unregistered_Decoder {
 impl ::rorm::model::Patch for Unregistered {
     type Model = Unregistered;
     type ValueSpaceImpl = __Unregistered_ValueSpaceImpl;
-    type Decoder = __Unregistered_Decoder;
     fn push_columns(columns: &mut Vec<&'static str>) {
         columns
             .extend(