From dedbfbafa079ec8ec72abd0f46ceb9d155c6e624 Mon Sep 17 00:00:00 2001 From: Tpt Date: Sat, 1 May 2021 14:39:15 +0200 Subject: [PATCH] SPARQL: Drops redundant From and TryFrom impls --- spargebra/src/term.rs | 125 ++++-------------------------------------- 1 file changed, 11 insertions(+), 114 deletions(-) diff --git a/spargebra/src/term.rs b/spargebra/src/term.rs index 2a8cdfa3..a9658166 100644 --- a/spargebra/src/term.rs +++ b/spargebra/src/term.rs @@ -178,13 +178,6 @@ impl From for Subject { } } -impl From> for Subject { - #[inline] - fn from(triple: Box) -> Self { - Self::Triple(triple) - } -} - impl TryFrom for Subject { type Error = (); @@ -193,7 +186,7 @@ impl TryFrom for Subject { match term { TermPattern::NamedNode(t) => Ok(t.into()), TermPattern::BlankNode(t) => Ok(t.into()), - TermPattern::Triple(t) => Ok(Triple::try_from(t)?.into()), + TermPattern::Triple(t) => Ok(Triple::try_from(*t)?.into()), TermPattern::Literal(_) | TermPattern::Variable(_) => Err(()), } } @@ -236,13 +229,6 @@ impl From for GroundSubject { } } -impl From> for GroundSubject { - #[inline] - fn from(triple: Box) -> Self { - Self::Triple(triple) - } -} - impl TryFrom for GroundSubject { type Error = (); @@ -251,7 +237,7 @@ impl TryFrom for GroundSubject { match subject { Subject::NamedNode(t) => Ok(t.into()), Subject::BlankNode(_) => Err(()), - Subject::Triple(t) => Ok(GroundTriple::try_from(t)?.into()), + Subject::Triple(t) => Ok(GroundTriple::try_from(*t)?.into()), } } } @@ -264,7 +250,7 @@ impl TryFrom for GroundSubject { match term { GroundTerm::NamedNode(t) => Ok(t.into()), GroundTerm::Literal(_) => Err(()), - GroundTerm::Triple(t) => Ok(t.into()), + GroundTerm::Triple(t) => Ok((*t).into()), } } } @@ -326,20 +312,13 @@ impl From for Term { } } -impl From> for Term { - #[inline] - fn from(triple: Box) -> Self { - Self::Triple(triple) - } -} - impl From for Term { #[inline] fn from(resource: Subject) -> Self { match resource { Subject::NamedNode(node) => node.into(), Subject::BlankNode(node) => node.into(), - Subject::Triple(t) => t.into(), + Subject::Triple(t) => (*t).into(), } } } @@ -353,7 +332,7 @@ impl TryFrom for Term { TermPattern::NamedNode(t) => Ok(t.into()), TermPattern::BlankNode(t) => Ok(t.into()), TermPattern::Literal(t) => Ok(t.into()), - TermPattern::Triple(t) => Ok(Triple::try_from(t)?.into()), + TermPattern::Triple(t) => Ok(Triple::try_from(*t)?.into()), TermPattern::Variable(_) => Err(()), } } @@ -405,13 +384,6 @@ impl From for GroundTerm { } } -impl From> for GroundTerm { - #[inline] - fn from(triple: Box) -> Self { - Self::Triple(triple) - } -} - impl TryFrom for GroundTerm { type Error = (); @@ -421,7 +393,7 @@ impl TryFrom for GroundTerm { Term::NamedNode(t) => Ok(t.into()), Term::BlankNode(_) => Err(()), Term::Literal(t) => Ok(t.into()), - Term::Triple(t) => Ok(GroundTriple::try_from(t)?.into()), + Term::Triple(t) => Ok(GroundTriple::try_from(*t)?.into()), } } } @@ -470,19 +442,6 @@ impl TryFrom for Triple { } } -impl TryFrom> for Triple { - type Error = (); - - #[inline] - fn try_from(triple: Box) -> Result { - Ok(Self { - subject: triple.subject.try_into()?, - predicate: triple.predicate.try_into()?, - object: triple.object.try_into()?, - }) - } -} - /// A [RDF triple](https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-triple) without blank nodes. /// /// The default string formatter is returning a N-Quads representation. @@ -527,19 +486,6 @@ impl TryFrom for GroundTriple { } } -impl TryFrom> for GroundTriple { - type Error = (); - - #[inline] - fn try_from(triple: Box) -> Result { - Ok(Self { - subject: triple.subject.try_into()?, - predicate: triple.predicate, - object: triple.object.try_into()?, - }) - } -} - /// A possible graph name. /// /// It is the union of [IRIs](https://www.w3.org/TR/rdf11-concepts/#dfn-iri) and the [default graph name](https://www.w3.org/TR/rdf11-concepts/#dfn-default-graph). @@ -793,13 +739,6 @@ impl From for TermPattern { } } -impl From> for TermPattern { - #[inline] - fn from(triple: Box) -> Self { - Self::Triple(triple) - } -} - impl From for TermPattern { fn from(var: Variable) -> Self { Self::Variable(var) @@ -812,7 +751,7 @@ impl From for TermPattern { match subject { Subject::NamedNode(node) => node.into(), Subject::BlankNode(node) => node.into(), - Subject::Triple(t) => TriplePattern::from(t).into(), + Subject::Triple(t) => TriplePattern::from(*t).into(), } } } @@ -824,7 +763,7 @@ impl From for TermPattern { Term::NamedNode(node) => node.into(), Term::BlankNode(node) => node.into(), Term::Literal(literal) => literal.into(), - Term::Triple(t) => TriplePattern::from(t).into(), + Term::Triple(t) => TriplePattern::from(*t).into(), } } } @@ -881,13 +820,6 @@ impl From for GroundTermPattern { } } -impl From> for GroundTermPattern { - #[inline] - fn from(triple: Box) -> Self { - Self::Triple(triple) - } -} - impl From for GroundTermPattern { #[inline] fn from(var: Variable) -> Self { @@ -900,7 +832,7 @@ impl From for GroundTermPattern { fn from(term: GroundSubject) -> Self { match term { GroundSubject::NamedNode(node) => node.into(), - GroundSubject::Triple(triple) => GroundTriplePattern::from(triple).into(), + GroundSubject::Triple(triple) => GroundTriplePattern::from(*triple).into(), } } } @@ -910,7 +842,7 @@ impl From for GroundTermPattern { match term { GroundTerm::NamedNode(node) => node.into(), GroundTerm::Literal(literal) => literal.into(), - GroundTerm::Triple(triple) => GroundTriplePattern::from(triple).into(), + GroundTerm::Triple(triple) => GroundTriplePattern::from(*triple).into(), } } } @@ -934,7 +866,7 @@ impl TryFrom for GroundTermPattern { TermPattern::NamedNode(named_node) => named_node.into(), TermPattern::BlankNode(_) => return Err(()), TermPattern::Literal(literal) => literal.into(), - TermPattern::Triple(triple) => GroundTriplePattern::try_from(triple)?.into(), + TermPattern::Triple(triple) => GroundTriplePattern::try_from(*triple)?.into(), TermPattern::Variable(variable) => variable.into(), }) } @@ -1033,17 +965,6 @@ impl From for TriplePattern { } } -impl From> for TriplePattern { - #[inline] - fn from(triple: Box) -> Self { - Self { - subject: triple.subject.into(), - predicate: triple.predicate.into(), - object: triple.object.into(), - } - } -} - /// A [triple pattern](https://www.w3.org/TR/sparql11-query/#defn_TriplePattern) without blank nodes #[derive(Eq, PartialEq, Debug, Clone, Hash)] pub struct GroundTriplePattern { @@ -1070,17 +991,6 @@ impl From for GroundTriplePattern { } } -impl From> for GroundTriplePattern { - #[inline] - fn from(triple: Box) -> Self { - Self { - subject: triple.subject.into(), - predicate: triple.predicate.into(), - object: triple.object.into(), - } - } -} - impl TryFrom for GroundTriplePattern { type Error = (); @@ -1094,19 +1004,6 @@ impl TryFrom for GroundTriplePattern { } } -impl TryFrom> for GroundTriplePattern { - type Error = (); - - #[inline] - fn try_from(triple: Box) -> Result { - Ok(Self { - subject: triple.subject.try_into()?, - predicate: triple.predicate, - object: triple.object.try_into()?, - }) - } -} - /// A [triple pattern](https://www.w3.org/TR/sparql11-query/#defn_TriplePattern) in a specific graph #[derive(Eq, PartialEq, Debug, Clone, Hash)] pub struct QuadPattern {