Simplifies the reexport of sub crates

pull/762/head
Tpt 8 months ago committed by Thomas Tanon
parent 2b6ac5c195
commit c0d245871c
  1. 24
      Cargo.lock
  2. 8
      lib/oxrdf/src/dataset.rs
  3. 2
      lib/oxrdf/src/graph.rs
  4. 2
      lib/sparesults/src/solution.rs
  5. 5
      lib/src/io/mod.rs
  6. 7
      lib/src/model.rs
  7. 2
      lib/src/sparql/eval.rs
  8. 5
      lib/src/sparql/results.rs

24
Cargo.lock generated

@ -1018,7 +1018,7 @@ dependencies = [
[[package]] [[package]]
name = "oxigraph" name = "oxigraph"
version = "0.4.0-alpha.3-dev" version = "0.4.0-alpha.3"
dependencies = [ dependencies = [
"codspeed-criterion-compat", "codspeed-criterion-compat",
"digest", "digest",
@ -1048,7 +1048,7 @@ dependencies = [
[[package]] [[package]]
name = "oxigraph-cli" name = "oxigraph-cli"
version = "0.4.0-alpha.3-dev" version = "0.4.0-alpha.3"
dependencies = [ dependencies = [
"anyhow", "anyhow",
"assert_cmd", "assert_cmd",
@ -1067,7 +1067,7 @@ dependencies = [
[[package]] [[package]]
name = "oxigraph-js" name = "oxigraph-js"
version = "0.4.0-alpha.3-dev" version = "0.4.0-alpha.3"
dependencies = [ dependencies = [
"console_error_panic_hook", "console_error_panic_hook",
"js-sys", "js-sys",
@ -1104,7 +1104,7 @@ checksum = "b225dad32cfaa43a960b93f01fa7f87528ac07e794b80f6d9a0153e0222557e2"
[[package]] [[package]]
name = "oxrdf" name = "oxrdf"
version = "0.2.0-alpha.2-dev" version = "0.2.0-alpha.2"
dependencies = [ dependencies = [
"oxilangtag", "oxilangtag",
"oxiri", "oxiri",
@ -1114,7 +1114,7 @@ dependencies = [
[[package]] [[package]]
name = "oxrdfio" name = "oxrdfio"
version = "0.1.0-alpha.2-dev" version = "0.1.0-alpha.2"
dependencies = [ dependencies = [
"oxrdf", "oxrdf",
"oxrdfxml", "oxrdfxml",
@ -1124,7 +1124,7 @@ dependencies = [
[[package]] [[package]]
name = "oxrdfxml" name = "oxrdfxml"
version = "0.1.0-alpha.2-dev" version = "0.1.0-alpha.2"
dependencies = [ dependencies = [
"oxilangtag", "oxilangtag",
"oxiri", "oxiri",
@ -1135,7 +1135,7 @@ dependencies = [
[[package]] [[package]]
name = "oxrocksdb-sys" name = "oxrocksdb-sys"
version = "0.4.0-alpha.3-dev" version = "0.4.0-alpha.3"
dependencies = [ dependencies = [
"bindgen", "bindgen",
"cc", "cc",
@ -1152,7 +1152,7 @@ dependencies = [
[[package]] [[package]]
name = "oxttl" name = "oxttl"
version = "0.1.0-alpha.2-dev" version = "0.1.0-alpha.2"
dependencies = [ dependencies = [
"memchr", "memchr",
"oxilangtag", "oxilangtag",
@ -1387,7 +1387,7 @@ dependencies = [
[[package]] [[package]]
name = "pyoxigraph" name = "pyoxigraph"
version = "0.4.0-alpha.3-dev" version = "0.4.0-alpha.3"
dependencies = [ dependencies = [
"oxigraph", "oxigraph",
"pyo3", "pyo3",
@ -1719,7 +1719,7 @@ checksum = "e6ecd384b10a64542d77071bd64bd7b231f4ed5940fba55e98c3de13824cf3d7"
[[package]] [[package]]
name = "sparesults" name = "sparesults"
version = "0.2.0-alpha.2-dev" version = "0.2.0-alpha.2"
dependencies = [ dependencies = [
"json-event-parser", "json-event-parser",
"memchr", "memchr",
@ -1730,7 +1730,7 @@ dependencies = [
[[package]] [[package]]
name = "spargebra" name = "spargebra"
version = "0.3.0-alpha.2-dev" version = "0.3.0-alpha.2"
dependencies = [ dependencies = [
"oxilangtag", "oxilangtag",
"oxiri", "oxiri",
@ -1741,7 +1741,7 @@ dependencies = [
[[package]] [[package]]
name = "sparopt" name = "sparopt"
version = "0.1.0-alpha.2-dev" version = "0.1.0-alpha.2"
dependencies = [ dependencies = [
"oxrdf", "oxrdf",
"rand", "rand",

@ -925,8 +925,8 @@ impl PartialEq for Dataset {
impl Eq for Dataset {} impl Eq for Dataset {}
impl<'a> IntoIterator for &'a Dataset { impl<'a> IntoIterator for &'a Dataset {
type Item = QuadRef<'a>;
type IntoIter = Iter<'a>; type IntoIter = Iter<'a>;
type Item = QuadRef<'a>;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
self.iter() self.iter()
@ -1283,8 +1283,8 @@ impl<'a> GraphView<'a> {
} }
impl<'a> IntoIterator for GraphView<'a> { impl<'a> IntoIterator for GraphView<'a> {
type Item = TripleRef<'a>;
type IntoIter = GraphViewIter<'a>; type IntoIter = GraphViewIter<'a>;
type Item = TripleRef<'a>;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
self.iter() self.iter()
@ -1292,8 +1292,8 @@ impl<'a> IntoIterator for GraphView<'a> {
} }
impl<'a, 'b> IntoIterator for &'b GraphView<'a> { impl<'a, 'b> IntoIterator for &'b GraphView<'a> {
type Item = TripleRef<'a>;
type IntoIter = GraphViewIter<'a>; type IntoIter = GraphViewIter<'a>;
type Item = TripleRef<'a>;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
self.iter() self.iter()
@ -1494,8 +1494,8 @@ impl<'a, 'b, T: Into<TripleRef<'b>>> Extend<T> for GraphViewMut<'a> {
} }
impl<'a> IntoIterator for &'a GraphViewMut<'a> { impl<'a> IntoIterator for &'a GraphViewMut<'a> {
type Item = TripleRef<'a>;
type IntoIter = GraphViewIter<'a>; type IntoIter = GraphViewIter<'a>;
type Item = TripleRef<'a>;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
self.iter() self.iter()

@ -229,8 +229,8 @@ impl PartialEq for Graph {
impl Eq for Graph {} impl Eq for Graph {}
impl<'a> IntoIterator for &'a Graph { impl<'a> IntoIterator for &'a Graph {
type Item = TripleRef<'a>;
type IntoIter = Iter<'a>; type IntoIter = Iter<'a>;
type Item = TripleRef<'a>;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
self.iter() self.iter()

@ -171,8 +171,8 @@ impl<V: Into<Arc<[Variable]>>, S: Into<Vec<Option<Term>>>> From<(V, S)> for Quer
} }
impl<'a> IntoIterator for &'a QuerySolution { impl<'a> IntoIterator for &'a QuerySolution {
type Item = (&'a Variable, &'a Term);
type IntoIter = Iter<'a>; type IntoIter = Iter<'a>;
type Item = (&'a Variable, &'a Term);
#[inline] #[inline]
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {

@ -36,7 +36,4 @@ pub use self::format::{DatasetFormat, GraphFormat};
pub use self::read::{DatasetParser, GraphParser}; pub use self::read::{DatasetParser, GraphParser};
#[allow(deprecated)] #[allow(deprecated)]
pub use self::write::{DatasetSerializer, GraphSerializer}; pub use self::write::{DatasetSerializer, GraphSerializer};
pub use oxrdfio::{ pub use oxrdfio::*;
FromReadQuadReader, ParseError, RdfFormat, RdfParser, RdfSerializer, SyntaxError, TextPosition,
ToWriteQuadWriter,
};

@ -17,9 +17,4 @@
//! assert_eq!(vec![triple], results); //! assert_eq!(vec![triple], results);
//! ``` //! ```
pub use oxrdf::{ 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,
};

@ -111,8 +111,8 @@ impl EncodedTuple {
} }
impl IntoIterator for EncodedTuple { impl IntoIterator for EncodedTuple {
type Item = Option<EncodedTerm>;
type IntoIter = std::vec::IntoIter<Option<EncodedTerm>>; type IntoIter = std::vec::IntoIter<Option<EncodedTerm>>;
type Item = Option<EncodedTerm>;
fn into_iter(self) -> Self::IntoIter { fn into_iter(self) -> Self::IntoIter {
self.inner.into_iter() self.inner.into_iter()

@ -41,7 +41,4 @@
//! ); //! );
//! ``` //! ```
pub use sparesults::{ pub use sparesults::*;
FromReadQueryResultsReader, FromReadSolutionsReader, ParseError, QueryResultsFormat,
QueryResultsParser, QueryResultsSerializer, SyntaxError, TextPosition,
};

Loading…
Cancel
Save