Skip to content

Readabilty chores #7

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
GordianDziwis wants to merge 15 commits into
base: main
Choose a base branch
from
Open

Readabilty chores #7

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
9918460
Make Clippy happy
GordianDziwis Mar 28, 2025
49c2ce0
Rename visit_graph to accept_graph_visitor
GordianDziwis Mar 28, 2025
c503cf0
Rename visit_subject to accept_subject_visitor
GordianDziwis Mar 28, 2025
eda0be9
Rename visit_objects to accept_objects_visitor
GordianDziwis Mar 28, 2025
1bc62fb
Rename visit to accept_visitor
GordianDziwis Mar 28, 2025
7d66c09
Rename default_graph to visit_default_graph
GordianDziwis Mar 28, 2025
f8e2b3b
Rename named_graph to visit_named_graph
GordianDziwis Mar 28, 2025
b10f2fa
Rename object to visit_object
GordianDziwis Mar 28, 2025
b51e3f6
Rename predicate to visit_predicate
GordianDziwis Mar 28, 2025
447b0bd
Rename reverse_predicate to visit_reverse_predicate
GordianDziwis Mar 28, 2025
82fc119
Rename graph to visit_graph
GordianDziwis Mar 28, 2025
a8c49f0
Rename include to visit_include
GordianDziwis Mar 28, 2025
0e26c18
Rename serializer to visitor
GordianDziwis Mar 28, 2025
f800b9a
Moved trait bounds to where clause (except I and V)
GordianDziwis Mar 28, 2025
6ad6f53
Rename subject to visit_subject
GordianDziwis Mar 29, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions derive/src/generate/ser.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ fn variant_compound_fields(
);

quote! {
<#ty as ::linked_data::LinkedDataSubject<I_, V_>>::visit_subject(#field_ref, &mut visitor)?;
<#ty as ::linked_data::LinkedDataSubject<I_, V_>>::accept_subject_visitor(#field_ref, &mut visitor)?;
}
} else {
match field_attrs.iri {
Expand All @@ -85,7 +85,7 @@ fn variant_compound_fields(
);

quote! {
visitor.predicate(
visitor.visit_predicate(
::linked_data::iref::Iri::new(#iri).unwrap(),
&Some(::linked_data::AnonymousGraph(#field_ref))
)?;
Expand All @@ -99,7 +99,7 @@ fn variant_compound_fields(
);

quote! {
visitor.predicate(
visitor.visit_predicate(
::linked_data::iref::Iri::new(#iri).unwrap(),
#field_ref
)?;
Expand Down
60 changes: 30 additions & 30 deletions derive/src/generate/ser/enum.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -212,7 +212,7 @@ pub fn generate(
}

impl #subject_impl_generics ::linked_data::LinkedDataSubject<I_, V_> for #ident #ty_generics #subject_where_clauses {
fn visit_subject<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_subject_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::SubjectVisitor<I_, V_>
{
Expand All @@ -223,7 +223,7 @@ pub fn generate(
}

impl #predicate_impl_generics ::linked_data::LinkedDataPredicateObjects<I_, V_> for #ident #ty_generics #predicate_where_clauses {
fn visit_objects<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_objects_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::PredicateObjectsVisitor<I_, V_>
{
Expand All @@ -234,7 +234,7 @@ pub fn generate(
}

impl #graph_impl_generics ::linked_data::LinkedDataGraph<I_, V_> for #ident #ty_generics #graph_where_clauses {
fn visit_graph<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_graph_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::GraphVisitor<I_, V_>
{
Expand All @@ -245,7 +245,7 @@ pub fn generate(
}

impl #dataset_impl_generics ::linked_data::LinkedData<I_, V_> for #ident #ty_generics #dataset_where_clauses {
fn visit<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::Visitor<I_, V_>
{
Expand Down Expand Up @@ -393,7 +393,7 @@ fn variant_visit_subject(
);

quote! {
visitor.predicate(
visitor.visit_predicate(
::linked_data::iref::Iri::new(#iri).unwrap(),
#id
)?;
Expand All @@ -408,7 +408,7 @@ fn variant_visit_subject(
vocabulary_bounds.add(inner_ty.visit_vocabulary_bounds);

quote! {
visitor.predicate(
visitor.visit_predicate(
::linked_data::iref::Iri::new(#iri).unwrap(),
&#inner_id #input
)?;
Expand All @@ -433,7 +433,7 @@ fn variant_visit_subject(
);

quote! {
<#ty as ::linked_data::LinkedDataSubject<I_, V_>>::visit_subject(#id, visitor)
<#ty as ::linked_data::LinkedDataSubject<I_, V_>>::accept_subject_visitor(#id, visitor)
}
}
VariantShape::Compound(inner_ty) => {
Expand All @@ -444,7 +444,7 @@ fn variant_visit_subject(
vocabulary_bounds.add(inner_ty.visit_vocabulary_bounds);

quote! {
#inner_id #input .visit_subject(visitor)
#inner_id #input .accept_subject_visitor(visitor)
}
}
VariantShape::Unit => {
Expand Down Expand Up @@ -481,7 +481,7 @@ fn variant_visit_predicate(
::linked_data::AnonymousBinding(
::linked_data::iref::Iri::new(#iri).unwrap(),
#id
).visit_objects(visitor)
).accept_objects_visitor(visitor)
}
}
VariantShape::Compound(inner_ty) => {
Expand All @@ -495,12 +495,12 @@ fn variant_visit_predicate(
::linked_data::AnonymousBinding(
::linked_data::iref::Iri::new(#iri).unwrap(),
&#inner_id #input
).visit_objects(visitor)
).accept_objects_visitor(visitor)
}
}
VariantShape::Unit => {
quote! {
visitor.object(::linked_data::iref::Iri::new(#iri).unwrap())?;
visitor.visit_object(::linked_data::iref::Iri::new(#iri).unwrap())?;
visitor.end()
}
}
Expand All @@ -516,7 +516,7 @@ fn variant_visit_predicate(
);

quote! {
<#ty as ::linked_data::LinkedDataPredicateObjects<I_, V_>>::visit_objects(#id, visitor)
<#ty as ::linked_data::LinkedDataPredicateObjects<I_, V_>>::accept_objects_visitor(#id, visitor)
}
}
VariantShape::Compound(inner_ty) => {
Expand All @@ -527,7 +527,7 @@ fn variant_visit_predicate(
vocabulary_bounds.add(inner_ty.visit_vocabulary_bounds);

quote! {
#inner_id #input .visit_objects(visitor)
#inner_id #input .accept_objects_visitor(visitor)
}
}
VariantShape::Unit => {
Expand Down Expand Up @@ -564,7 +564,7 @@ fn variant_visit_graph(
::linked_data::AnonymousBinding(
::linked_data::iref::Iri::new(#iri).unwrap(),
#id
).visit_graph(visitor)
).accept_graph_visitor(visitor)
}
}
VariantShape::Compound(inner_ty) => {
Expand All @@ -578,12 +578,12 @@ fn variant_visit_graph(
::linked_data::AnonymousBinding(
::linked_data::iref::Iri::new(#iri).unwrap(),
&#inner_id #input
).visit_graph(visitor)
).accept_graph_visitor(visitor)
}
}
VariantShape::Unit => {
quote! {
visitor.subject(::linked_data::iref::Iri::new(#iri).unwrap())?;
visitor.visit_subject(::linked_data::iref::Iri::new(#iri).unwrap())?;
visitor.end()
}
}
Expand All @@ -599,7 +599,7 @@ fn variant_visit_graph(
);

quote! {
<#ty as ::linked_data::LinkedDataGraph<I_, V_>>::visit_graph(#id, visitor)
<#ty as ::linked_data::LinkedDataGraph<I_, V_>>::accept_graph_visitor(#id, visitor)
}
}
VariantShape::Compound(inner_ty) => {
Expand All @@ -610,7 +610,7 @@ fn variant_visit_graph(
vocabulary_bounds.add(inner_ty.visit_vocabulary_bounds);

quote! {
#inner_id #input .visit_graph(visitor)
#inner_id #input .accept_graph_visitor(visitor)
}
}
VariantShape::Unit => {
Expand Down Expand Up @@ -647,7 +647,7 @@ fn variant_serialize(
::linked_data::AnonymousBinding(
::linked_data::iref::Iri::new(#iri).unwrap(),
#id
).visit(visitor)
).accept_visitor(visitor)
}
}
VariantShape::Compound(inner_ty) => {
Expand All @@ -661,12 +661,12 @@ fn variant_serialize(
::linked_data::AnonymousBinding(
::linked_data::iref::Iri::new(#iri).unwrap(),
&#inner_id #input
).visit(visitor)
).accept_visitor(visitor)
}
}
VariantShape::Unit => {
quote! {
visitor.default_graph(::linked_data::iref::Iri::new(#iri).unwrap())?;
visitor.visit_default_graph(::linked_data::iref::Iri::new(#iri).unwrap())?;
visitor.end()
}
}
Expand All @@ -682,7 +682,7 @@ fn variant_serialize(
);

quote! {
<#ty as ::linked_data::LinkedData<I_, V_>>::visit(#id, visitor)
<#ty as ::linked_data::LinkedData<I_, V_>>::accept_visitor(#id, visitor)
}
}
VariantShape::Compound(inner_ty) => {
Expand All @@ -693,7 +693,7 @@ fn variant_serialize(
vocabulary_bounds.add(inner_ty.visit_vocabulary_bounds);

quote! {
#inner_id #input .visit(visitor)
#inner_id #input .accept_visitor(visitor)
}
}
VariantShape::Unit => {
Expand Down Expand Up @@ -854,7 +854,7 @@ fn variant_subject_type(
}

impl #visit_impl_generics ::linked_data::LinkedDataSubject<I_, V_> for #subject_id #ty_generics #visit_where_clauses {
fn visit_subject<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_subject_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::SubjectVisitor<I_, V_>
{
Expand All @@ -864,31 +864,31 @@ fn variant_subject_type(
}

impl #visit_impl_generics ::linked_data::LinkedDataPredicateObjects<I_, V_> for #subject_id #ty_generics #visit_where_clauses {
fn visit_objects<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_objects_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::PredicateObjectsVisitor<I_, V_>
{
visitor.object(self)?;
visitor.visit_object(self)?;
visitor.end()
}
}

impl #visit_impl_generics ::linked_data::LinkedDataGraph<I_, V_> for #subject_id #ty_generics #visit_where_clauses {
fn visit_graph<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_graph_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::GraphVisitor<I_, V_>
{
visitor.subject(self)?;
visitor.visit_subject(self)?;
visitor.end()
}
}

impl #visit_impl_generics ::linked_data::LinkedData<I_, V_> for #subject_id #ty_generics #visit_where_clauses {
fn visit<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::Visitor<I_, V_>
{
visitor.default_graph(self)?;
visitor.visit_default_graph(self)?;
visitor.end()
}
}
Expand Down
16 changes: 8 additions & 8 deletions derive/src/generate/ser/struct.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ pub fn generate(
let rdf_type = RDF_TYPE.as_str();

Ok(quote! {
visitor.predicate(
visitor.visit_predicate(
::linked_data::iref::Iri::new(#rdf_type).unwrap(),
::linked_data::iref::Iri::new(#iri).unwrap()
)?;
Expand Down Expand Up @@ -86,7 +86,7 @@ pub fn generate(
}

impl #impl_generics ::linked_data::LinkedDataSubject<I_, V_> for #ident #ty_generics #where_clause {
fn visit_subject<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_subject_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::SubjectVisitor<I_, V_>
{
Expand All @@ -96,31 +96,31 @@ pub fn generate(
}

impl #impl_generics ::linked_data::LinkedDataPredicateObjects<I_, V_> for #ident #ty_generics #where_clause {
fn visit_objects<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_objects_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::PredicateObjectsVisitor<I_, V_>
{
visitor.object(self)?;
visitor.visit_object(self)?;
visitor.end()
}
}

impl #impl_generics ::linked_data::LinkedDataGraph<I_, V_> for #ident #ty_generics #where_clause {
fn visit_graph<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_graph_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::GraphVisitor<I_, V_>
{
visitor.subject(self)?;
visitor.visit_subject(self)?;
visitor.end()
}
}

impl #impl_generics ::linked_data::LinkedData<I_, V_> for #ident #ty_generics #where_clause {
fn visit<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
fn accept_visitor<S_>(&self, mut visitor: S_) -> Result<S_::Ok, S_::Error>
where
S_: ::linked_data::Visitor<I_, V_>
{
visitor.default_graph(self)?;
visitor.visit_default_graph(self)?;
visitor.end()
}
}
Expand Down
Loading