diff --git a/Cargo.lock b/Cargo.lock index 70b1abfb..b63ea4a0 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -1018,7 +1018,7 @@ dependencies = [ [[package]] name = "oxigraph" -version = "0.4.0-alpha.3-dev" +version = "0.4.0-alpha.3" dependencies = [ "codspeed-criterion-compat", "digest", @@ -1048,7 +1048,7 @@ dependencies = [ [[package]] name = "oxigraph-cli" -version = "0.4.0-alpha.3-dev" +version = "0.4.0-alpha.3" dependencies = [ "anyhow", "assert_cmd", @@ -1067,7 +1067,7 @@ dependencies = [ [[package]] name = "oxigraph-js" -version = "0.4.0-alpha.3-dev" +version = "0.4.0-alpha.3" dependencies = [ "console_error_panic_hook", "js-sys", @@ -1104,7 +1104,7 @@ checksum = "b225dad32cfaa43a960b93f01fa7f87528ac07e794b80f6d9a0153e0222557e2" [[package]] name = "oxrdf" -version = "0.2.0-alpha.2-dev" +version = "0.2.0-alpha.2" dependencies = [ "oxilangtag", "oxiri", @@ -1114,7 +1114,7 @@ dependencies = [ [[package]] name = "oxrdfio" -version = "0.1.0-alpha.2-dev" +version = "0.1.0-alpha.2" dependencies = [ "oxrdf", "oxrdfxml", @@ -1124,7 +1124,7 @@ dependencies = [ [[package]] name = "oxrdfxml" -version = "0.1.0-alpha.2-dev" +version = "0.1.0-alpha.2" dependencies = [ "oxilangtag", "oxiri", @@ -1135,7 +1135,7 @@ dependencies = [ [[package]] name = "oxrocksdb-sys" -version = "0.4.0-alpha.3-dev" +version = "0.4.0-alpha.3" dependencies = [ "bindgen", "cc", @@ -1152,7 +1152,7 @@ dependencies = [ [[package]] name = "oxttl" -version = "0.1.0-alpha.2-dev" +version = "0.1.0-alpha.2" dependencies = [ "memchr", "oxilangtag", @@ -1387,7 +1387,7 @@ dependencies = [ [[package]] name = "pyoxigraph" -version = "0.4.0-alpha.3-dev" +version = "0.4.0-alpha.3" dependencies = [ "oxigraph", "pyo3", @@ -1719,7 +1719,7 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7" [[package]] name = "sparesults" -version = "0.2.0-alpha.2-dev" +version = "0.2.0-alpha.2" dependencies = [ "json-event-parser", "memchr", @@ -1730,7 +1730,7 @@ dependencies = [ [[package]] name = "spargebra" -version = "0.3.0-alpha.2-dev" +version = "0.3.0-alpha.2" dependencies = [ "oxilangtag", "oxiri", @@ -1741,7 +1741,7 @@ dependencies = [ [[package]] name = "sparopt" -version = "0.1.0-alpha.2-dev" +version = "0.1.0-alpha.2" dependencies = [ "oxrdf", "rand", diff --git a/lib/oxrdf/src/dataset.rs b/lib/oxrdf/src/dataset.rs index ed6249a4..8412a8aa 100644 --- a/lib/oxrdf/src/dataset.rs +++ b/lib/oxrdf/src/dataset.rs @@ -925,8 +925,8 @@ impl PartialEq for Dataset { impl Eq for Dataset {} impl<'a> IntoIterator for &'a Dataset { - type Item = QuadRef<'a>; type IntoIter = Iter<'a>; + type Item = QuadRef<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() @@ -1283,8 +1283,8 @@ impl<'a> GraphView<'a> { } impl<'a> IntoIterator for GraphView<'a> { - type Item = TripleRef<'a>; type IntoIter = GraphViewIter<'a>; + type Item = TripleRef<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() @@ -1292,8 +1292,8 @@ impl<'a> IntoIterator for GraphView<'a> { } impl<'a, 'b> IntoIterator for &'b GraphView<'a> { - type Item = TripleRef<'a>; type IntoIter = GraphViewIter<'a>; + type Item = TripleRef<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() @@ -1494,8 +1494,8 @@ impl<'a, 'b, T: Into>> Extend for GraphViewMut<'a> { } impl<'a> IntoIterator for &'a GraphViewMut<'a> { - type Item = TripleRef<'a>; type IntoIter = GraphViewIter<'a>; + type Item = TripleRef<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() diff --git a/lib/oxrdf/src/graph.rs b/lib/oxrdf/src/graph.rs index 5459b65c..33f67132 100644 --- a/lib/oxrdf/src/graph.rs +++ b/lib/oxrdf/src/graph.rs @@ -229,8 +229,8 @@ impl PartialEq for Graph { impl Eq for Graph {} impl<'a> IntoIterator for &'a Graph { - type Item = TripleRef<'a>; type IntoIter = Iter<'a>; + type Item = TripleRef<'a>; fn into_iter(self) -> Self::IntoIter { self.iter() diff --git a/lib/sparesults/src/solution.rs b/lib/sparesults/src/solution.rs index a1364861..826a9eea 100644 --- a/lib/sparesults/src/solution.rs +++ b/lib/sparesults/src/solution.rs @@ -171,8 +171,8 @@ impl>, S: Into>>> From<(V, S)> for Quer } impl<'a> IntoIterator for &'a QuerySolution { - type Item = (&'a Variable, &'a Term); type IntoIter = Iter<'a>; + type Item = (&'a Variable, &'a Term); #[inline] fn into_iter(self) -> Self::IntoIter { diff --git a/lib/src/io/mod.rs b/lib/src/io/mod.rs index 883abb2a..1b15bc8e 100644 --- a/lib/src/io/mod.rs +++ b/lib/src/io/mod.rs @@ -36,7 +36,4 @@ pub use self::format::{DatasetFormat, GraphFormat}; pub use self::read::{DatasetParser, GraphParser}; #[allow(deprecated)] pub use self::write::{DatasetSerializer, GraphSerializer}; -pub use oxrdfio::{ - FromReadQuadReader, ParseError, RdfFormat, RdfParser, RdfSerializer, SyntaxError, TextPosition, - ToWriteQuadWriter, -}; +pub use oxrdfio::*; diff --git a/lib/src/model.rs b/lib/src/model.rs index ef8cbd1d..3a9fd053 100644 --- a/lib/src/model.rs +++ b/lib/src/model.rs @@ -17,9 +17,4 @@ //! assert_eq!(vec![triple], results); //! ``` -pub use oxrdf::{ - dataset, graph, vocab, BlankNode, BlankNodeIdParseError, BlankNodeRef, Dataset, Graph, - GraphName, GraphNameRef, IriParseError, LanguageTagParseError, Literal, LiteralRef, NamedNode, - NamedNodeRef, NamedOrBlankNode, NamedOrBlankNodeRef, Quad, QuadRef, Subject, SubjectRef, Term, - TermParseError, TermRef, Triple, TripleRef, -}; +pub use oxrdf::*; diff --git a/lib/src/sparql/eval.rs b/lib/src/sparql/eval.rs index 174f41fa..19c6884d 100644 --- a/lib/src/sparql/eval.rs +++ b/lib/src/sparql/eval.rs @@ -111,8 +111,8 @@ impl EncodedTuple { } impl IntoIterator for EncodedTuple { - type Item = Option; type IntoIter = std::vec::IntoIter>; + type Item = Option; fn into_iter(self) -> Self::IntoIter { self.inner.into_iter() diff --git a/lib/src/sparql/results.rs b/lib/src/sparql/results.rs index 88aff947..00f8cc3d 100644 --- a/lib/src/sparql/results.rs +++ b/lib/src/sparql/results.rs @@ -41,7 +41,4 @@ //! ); //! ``` -pub use sparesults::{ - FromReadQueryResultsReader, FromReadSolutionsReader, ParseError, QueryResultsFormat, - QueryResultsParser, QueryResultsSerializer, SyntaxError, TextPosition, -}; +pub use sparesults::*;