Fix implicit lifetime (#181)

It broke with Rust 1.78
spruceid · May 2, 2024 · 44aaf86 · 44aaf86
1 parent 90d53f7
commit 44aaf86
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 8 deletions.
diff --git a/layouts/src/distill/hy/data.rs b/layouts/src/distill/hy/data.rs
@@ -15,7 +15,7 @@ use xsd_types::{lexical::Lexical, ParseXsd};
 
 use super::{DataFragment, Error, MatchingForFragment};
 
-pub fn hydrate_data<V, I: Interpretation, D>(
+pub fn hydrate_data<V, I, D>(
 	vocabulary: &V,
 	interpretation: &I,
 	dataset: &D,
@@ -27,7 +27,9 @@ pub fn hydrate_data<V, I: Interpretation, D>(
 where
 	V: Vocabulary,
 	V::Iri: PartialEq,
-	I: ReverseIriInterpretation<Iri = V::Iri> + ReverseLiteralInterpretation<Literal = V::Literal>,
+	I: Interpretation
+		+ ReverseIriInterpretation<Iri = V::Iri>
+		+ ReverseLiteralInterpretation<Literal = V::Literal>,
 	I::Resource: Clone + PartialEq,
 	D: PatternMatchingDataset<Resource = I::Resource>,
 {

diff --git a/layouts/src/distill/hy/mod.rs b/layouts/src/distill/hy/mod.rs
@@ -127,7 +127,7 @@ where
 
 /// Serialize the given RDF `dataset` using the provided `layout`, returning
 /// a typed value.
-pub fn hydrate_with<V, I: Interpretation, D>(
+pub fn hydrate_with<V, I, D>(
 	vocabulary: &V,
 	interpretation: &I,
 	context: impl LayoutRegistry<I::Resource>,
@@ -139,7 +139,9 @@ pub fn hydrate_with<V, I: Interpretation, D>(
 where
 	V: Vocabulary,
 	V::Iri: PartialEq,
-	I: ReverseIriInterpretation<Iri = V::Iri> + ReverseLiteralInterpretation<Literal = V::Literal>,
+	I: Interpretation
+		+ ReverseIriInterpretation<Iri = V::Iri>
+		+ ReverseLiteralInterpretation<Literal = V::Literal>,
 	I::Resource: Clone + Ord,
 	D: PatternMatchingDataset<Resource = I::Resource>,
 {
@@ -154,7 +156,7 @@ where
 	)
 }
 
-fn hydrate_with_ref<V, I: Interpretation, D>(
+fn hydrate_with_ref<V, I, D>(
 	vocabulary: &V,
 	interpretation: &I,
 	context: &impl LayoutRegistry<I::Resource>,
@@ -166,7 +168,9 @@ fn hydrate_with_ref<V, I: Interpretation, D>(
 where
 	V: Vocabulary,
 	V::Iri: PartialEq,
-	I: ReverseIriInterpretation<Iri = V::Iri> + ReverseLiteralInterpretation<Literal = V::Literal>,
+	I: Interpretation
+		+ ReverseIriInterpretation<Iri = V::Iri>
+		+ ReverseLiteralInterpretation<Literal = V::Literal>,
 	I::Resource: Clone + Ord,
 	D: PatternMatchingDataset<Resource = I::Resource>,
 {

diff --git a/layouts/src/matching.rs b/layouts/src/matching.rs
@@ -73,7 +73,7 @@ where
 
 impl<'a, 'p, R, D, Q> Matching<'a, 'p, R, D, Q>
 where
-	R: Clone + PartialEq,
+	R: Clone + PartialEq + 'a,
 	D: PatternMatchingDataset<Resource = R>,
 	Q: Clone + Iterator<Item = PatternRefQuad<'p, R>>,
 {
@@ -97,7 +97,7 @@ where
 
 impl<'a, 'p, R, D, Q> Iterator for Matching<'a, 'p, R, D, Q>
 where
-	R: Clone + PartialEq,
+	R: Clone + PartialEq + 'a,
 	D: PatternMatchingDataset<Resource = R>,
 	Q: Clone + Iterator<Item = PatternRefQuad<'p, R>>,
 {