Uses nightly rustfmt on imports and comments

cli/src/main.rs

@@ -1845,7 +1845,8 @@ mod tests {
     use super::*;
     use anyhow::Result;
     use assert_cmd::Command;
-    use assert_fs::{prelude::*, NamedTempFile, TempDir};
+    use assert_fs::prelude::*;
+    use assert_fs::{NamedTempFile, TempDir};
     use flate2::write::GzEncoder;
     use flate2::Compression;
     use oxhttp::model::Method;

lib/oxrdf/src/blank_node.rs

@@ -1,8 +1,7 @@
 use rand::random;
 use std::error::Error;
-use std::fmt;
 use std::io::Write;
-use std::str;
+use std::{fmt, str};
 
 /// An owned RDF [blank node](https://www.w3.org/TR/rdf11-concepts/#dfn-blank-node).
 ///
@@ -15,10 +14,7 @@ use std::str;
 /// ```
 /// use oxrdf::BlankNode;
 ///
-/// assert_eq!(
+/// assert_eq!("_:a122", BlankNode::new("a122")?.to_string());
-///     "_:a122",
-///     BlankNode::new("a122")?.to_string()
-/// );
 /// # Result::<_,oxrdf::BlankNodeIdParseError>::Ok(())
 /// ```
 #[derive(Eq, PartialEq, Debug, Clone, Hash)]
@@ -133,10 +129,7 @@ impl Default for BlankNode {
 /// ```
 /// use oxrdf::BlankNodeRef;
 ///
-/// assert_eq!(
+/// assert_eq!("_:a122", BlankNodeRef::new("a122")?.to_string());
-///     "_:a122",
-///     BlankNodeRef::new("a122")?.to_string()
-/// );
 /// # Result::<_,oxrdf::BlankNodeIdParseError>::Ok(())
 /// ```
 #[derive(Eq, PartialEq, Debug, Clone, Copy, Hash)]
@@ -192,7 +185,10 @@ impl<'a> BlankNodeRef<'a> {
     /// ```
     /// use oxrdf::BlankNode;
     ///
-    /// assert_eq!(BlankNode::new_from_unique_id(128).as_ref().unique_id(), Some(128));
+    /// assert_eq!(
+    ///     BlankNode::new_from_unique_id(128).as_ref().unique_id(),
+    ///     Some(128)
+    /// );
     /// assert_eq!(BlankNode::new("foo")?.as_ref().unique_id(), None);
     /// # Result::<_,oxrdf::BlankNodeIdParseError>::Ok(())
     /// ```

lib/oxrdf/src/dataset.rs

@@ -20,19 +20,20 @@
 //! assert_eq!(vec![TripleRef::new(ex, ex, ex)], results);
 //!
 //! // Print
-//! assert_eq!(dataset.to_string(), "<http://example.com> <http://example.com> <http://example.com> <http://example.com> .\n");
+//! assert_eq!(
+//!     dataset.to_string(),
+//!     "<http://example.com> <http://example.com> <http://example.com> <http://example.com> .\n"
+//! );
 //! # Result::<_,Box<dyn std::error::Error>>::Ok(())
 //! ```
 //!
 //! See also [`Graph`] if you only care about plain triples.
 
 use crate::interning::*;
-use crate::SubjectRef;
 use crate::*;
 use std::cmp::min;
 use std::collections::hash_map::DefaultHasher;
-use std::collections::BTreeSet;
+use std::collections::{BTreeSet, HashMap, HashSet};
-use std::collections::{HashMap, HashSet};
 use std::fmt;
 use std::hash::{Hash, Hasher};
 
@@ -924,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()
@@ -1282,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()
@@ -1291,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()
@@ -1493,8 +1494,8 @@ impl<'a, 'b, T: Into<TripleRef<'b>>> Extend<T> 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()

lib/oxrdf/src/graph.rs

@@ -16,7 +16,10 @@
 //! assert_eq!(vec![triple], results);
 //!
 //! // Print
-//! assert_eq!(graph.to_string(), "<http://example.com> <http://example.com> <http://example.com> .\n");
+//! assert_eq!(
+//!     graph.to_string(),
+//!     "<http://example.com> <http://example.com> <http://example.com> .\n"
+//! );
 //! # Result::<_,Box<dyn std::error::Error>>::Ok(())
 //! ```
 //!
@@ -226,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()

lib/oxrdf/src/literal.rs

@@ -1,6 +1,5 @@
 use crate::named_node::NamedNode;
-use crate::vocab::rdf;
+use crate::vocab::{rdf, xsd};
-use crate::vocab::xsd;
 use crate::NamedNodeRef;
 use oxilangtag::{LanguageTag, LanguageTagParseError};
 #[cfg(feature = "oxsdatatypes")]
@@ -15,8 +14,8 @@ use std::option::Option;
 /// The default string formatter is returning an N-Triples, Turtle, and SPARQL compatible representation:
 /// ```
 /// # use oxilangtag::LanguageTagParseError;
-/// use oxrdf::Literal;
 /// use oxrdf::vocab::xsd;
+/// use oxrdf::Literal;
 ///
 /// assert_eq!(
 ///     "\"foo\\nbar\"",
@@ -427,8 +426,8 @@ impl From<DayTimeDuration> for Literal {
 ///
 /// The default string formatter is returning an N-Triples, Turtle, and SPARQL compatible representation:
 /// ```
-/// use oxrdf::LiteralRef;
 /// use oxrdf::vocab::xsd;
+/// use oxrdf::LiteralRef;
 ///
 /// assert_eq!(
 ///     "\"foo\\nbar\"",

lib/oxrdf/src/parser.rs

@@ -5,10 +5,9 @@ use crate::{
 };
 #[cfg(feature = "rdf-star")]
 use crate::{Subject, Triple};
-use std::char;
 use std::error::Error;
-use std::fmt;
 use std::str::{Chars, FromStr};
+use std::{char, fmt};
 
 /// This limit is set in order to avoid stack overflow error when parsing nested triples due to too many recursive calls.
 /// The actual limit value is a wet finger compromise between not failing to parse valid files and avoiding to trigger stack overflow errors.
@@ -23,7 +22,10 @@ impl FromStr for NamedNode {
     /// use oxrdf::NamedNode;
     /// use std::str::FromStr;
     ///
-    /// assert_eq!(NamedNode::from_str("<http://example.com>").unwrap(), NamedNode::new("http://example.com").unwrap())
+    /// assert_eq!(
+    ///     NamedNode::from_str("<http://example.com>").unwrap(),
+    ///     NamedNode::new("http://example.com").unwrap()
+    /// )
     /// ```
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let (term, left) = read_named_node(s)?;
@@ -45,7 +47,10 @@ impl FromStr for BlankNode {
     /// use oxrdf::BlankNode;
     /// use std::str::FromStr;
     ///
-    /// assert_eq!(BlankNode::from_str("_:ex").unwrap(), BlankNode::new("ex").unwrap())
+    /// assert_eq!(
+    ///     BlankNode::from_str("_:ex").unwrap(),
+    ///     BlankNode::new("ex").unwrap()
+    /// )
     /// ```
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let (term, left) = read_blank_node(s)?;
@@ -64,16 +69,41 @@ impl FromStr for Literal {
     /// Parses a literal from its NTriples or Turtle serialization
     ///
     /// ```
-    /// use oxrdf::{Literal, NamedNode, vocab::xsd};
+    /// use oxrdf::vocab::xsd;
+    /// use oxrdf::{Literal, NamedNode};
     /// use std::str::FromStr;
     ///
-    /// assert_eq!(Literal::from_str("\"ex\\n\"").unwrap(), Literal::new_simple_literal("ex\n"));
+    /// assert_eq!(
-    /// assert_eq!(Literal::from_str("\"ex\"@en").unwrap(), Literal::new_language_tagged_literal("ex", "en").unwrap());
+    ///     Literal::from_str("\"ex\\n\"").unwrap(),
-    /// assert_eq!(Literal::from_str("\"2020\"^^<http://www.w3.org/2001/XMLSchema#gYear>").unwrap(), Literal::new_typed_literal("2020", NamedNode::new("http://www.w3.org/2001/XMLSchema#gYear").unwrap()));
+    ///     Literal::new_simple_literal("ex\n")
-    /// assert_eq!(Literal::from_str("true").unwrap(), Literal::new_typed_literal("true", xsd::BOOLEAN));
+    /// );
-    /// assert_eq!(Literal::from_str("+122").unwrap(), Literal::new_typed_literal("+122", xsd::INTEGER));
+    /// assert_eq!(
-    /// assert_eq!(Literal::from_str("-122.23").unwrap(), Literal::new_typed_literal("-122.23", xsd::DECIMAL));
+    ///     Literal::from_str("\"ex\"@en").unwrap(),
-    /// assert_eq!(Literal::from_str("-122e+1").unwrap(), Literal::new_typed_literal("-122e+1", xsd::DOUBLE));
+    ///     Literal::new_language_tagged_literal("ex", "en").unwrap()
+    /// );
+    /// assert_eq!(
+    ///     Literal::from_str("\"2020\"^^<http://www.w3.org/2001/XMLSchema#gYear>").unwrap(),
+    ///     Literal::new_typed_literal(
+    ///         "2020",
+    ///         NamedNode::new("http://www.w3.org/2001/XMLSchema#gYear").unwrap()
+    ///     )
+    /// );
+    /// assert_eq!(
+    ///     Literal::from_str("true").unwrap(),
+    ///     Literal::new_typed_literal("true", xsd::BOOLEAN)
+    /// );
+    /// assert_eq!(
+    ///     Literal::from_str("+122").unwrap(),
+    ///     Literal::new_typed_literal("+122", xsd::INTEGER)
+    /// );
+    /// assert_eq!(
+    ///     Literal::from_str("-122.23").unwrap(),
+    ///     Literal::new_typed_literal("-122.23", xsd::DECIMAL)
+    /// );
+    /// assert_eq!(
+    ///     Literal::from_str("-122e+1").unwrap(),
+    ///     Literal::new_typed_literal("-122e+1", xsd::DOUBLE)
+    /// );
     /// ```
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let (term, left) = read_literal(s)?;
@@ -93,12 +123,19 @@ impl FromStr for Term {
     /// use oxrdf::*;
     /// use std::str::FromStr;
     ///
-    /// assert_eq!(Term::from_str("\"ex\"").unwrap(), Literal::new_simple_literal("ex").into());
+    /// assert_eq!(
-    /// assert_eq!(Term::from_str("<< _:s <http://example.com/p> \"o\" >>").unwrap(), Triple::new(
+    ///     Term::from_str("\"ex\"").unwrap(),
+    ///     Literal::new_simple_literal("ex").into()
+    /// );
+    /// assert_eq!(
+    ///     Term::from_str("<< _:s <http://example.com/p> \"o\" >>").unwrap(),
+    ///     Triple::new(
     ///         BlankNode::new("s").unwrap(),
     ///         NamedNode::new("http://example.com/p").unwrap(),
     ///         Literal::new_simple_literal("o")
-    /// ).into());
+    ///     )
+    ///     .into()
+    /// );
     /// ```
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         let (term, left) = read_term(s, 0)?;
@@ -118,7 +155,10 @@ impl FromStr for Variable {
     /// use oxrdf::Variable;
     /// use std::str::FromStr;
     ///
-    /// assert_eq!(Variable::from_str("$foo").unwrap(), Variable::new("foo").unwrap())
+    /// assert_eq!(
+    ///     Variable::from_str("$foo").unwrap(),
+    ///     Variable::new("foo").unwrap()
+    /// )
     /// ```
     fn from_str(s: &str) -> Result<Self, Self::Err> {
         if !s.starts_with('?') && !s.starts_with('$') {

lib/oxrdf/src/triple.rs

@@ -698,7 +698,7 @@ impl<'a> From<TermRef<'a>> for Term {
 ///
 /// The default string formatter is returning an N-Triples, Turtle, and SPARQL compatible representation:
 /// ```
-/// use oxrdf::{Triple, NamedNode};
+/// use oxrdf::{NamedNode, Triple};
 ///
 /// assert_eq!(
 ///     "<http://example.com/s> <http://example.com/p> <http://example.com/o>",
@@ -706,7 +706,8 @@ impl<'a> From<TermRef<'a>> for Term {
 ///         subject: NamedNode::new("http://example.com/s")?.into(),
 ///         predicate: NamedNode::new("http://example.com/p")?,
 ///         object: NamedNode::new("http://example.com/o")?.into(),
-///     }.to_string()
+///     }
+///     .to_string()
 /// );
 /// # Result::<_,oxrdf::IriParseError>::Ok(())
 /// ```
@@ -769,7 +770,7 @@ impl fmt::Display for Triple {
 ///
 /// The default string formatter is returning an N-Triples, Turtle, and SPARQL compatible representation:
 /// ```
-/// use oxrdf::{TripleRef, NamedNodeRef};
+/// use oxrdf::{NamedNodeRef, TripleRef};
 ///
 /// assert_eq!(
 ///     "<http://example.com/s> <http://example.com/p> <http://example.com/o>",
@@ -777,7 +778,8 @@ impl fmt::Display for Triple {
 ///         subject: NamedNodeRef::new("http://example.com/s")?.into(),
 ///         predicate: NamedNodeRef::new("http://example.com/p")?,
 ///         object: NamedNodeRef::new("http://example.com/o")?.into(),
-///     }.to_string()
+///     }
+///     .to_string()
 /// );
 /// # Result::<_,oxrdf::IriParseError>::Ok(())
 /// ```

lib/oxrdf/src/variable.rs

@@ -8,10 +8,7 @@ use std::fmt;
 /// ```
 /// use oxrdf::{Variable, VariableNameParseError};
 ///
-/// assert_eq!(
+/// assert_eq!("?foo", Variable::new("foo")?.to_string());
-///     "?foo",
-///     Variable::new("foo")?.to_string()
-/// );
 /// # Result::<_,VariableNameParseError>::Ok(())
 /// ```
 #[derive(Eq, PartialEq, Ord, PartialOrd, Debug, Clone, Hash)]
@@ -67,12 +64,9 @@ impl fmt::Display for Variable {
 ///
 /// The default string formatter is returning a SPARQL compatible representation:
 /// ```
-/// use oxrdf::{VariableRef, VariableNameParseError};
+/// use oxrdf::{VariableNameParseError, VariableRef};
 ///
-/// assert_eq!(
+/// assert_eq!("?foo", VariableRef::new("foo")?.to_string());
-///     "?foo",
-///     VariableRef::new("foo")?.to_string()
-/// );
 /// # Result::<_,VariableNameParseError>::Ok(())
 /// ```
 #[derive(Eq, PartialEq, Ord, PartialOrd, Debug, Clone, Copy, Hash)]

lib/oxrdfio/src/format.rs

@@ -26,7 +26,10 @@ impl RdfFormat {
     /// ```
     /// use oxrdfio::RdfFormat;
     ///
-    /// assert_eq!(RdfFormat::NTriples.iri(), "http://www.w3.org/ns/formats/N-Triples")
+    /// assert_eq!(
+    ///     RdfFormat::NTriples.iri(),
+    ///     "http://www.w3.org/ns/formats/N-Triples"
+    /// )
     /// ```
     #[inline]
     pub const fn iri(self) -> &'static str {
@@ -136,7 +139,10 @@ impl RdfFormat {
     /// ```
     /// use oxrdfio::RdfFormat;
     ///
-    /// assert_eq!(RdfFormat::from_media_type("text/turtle; charset=utf-8"), Some(RdfFormat::Turtle))
+    /// assert_eq!(
+    ///     RdfFormat::from_media_type("text/turtle; charset=utf-8"),
+    ///     Some(RdfFormat::Turtle)
+    /// )
     /// ```
     #[inline]
     pub fn from_media_type(media_type: &str) -> Option<Self> {

lib/oxrdfio/src/parser.rs

@@ -48,7 +48,9 @@ use tokio::io::AsyncRead;
 /// let file = "<http://example.com/s> <http://example.com/p> <http://example.com/o> .";
 ///
 /// let parser = RdfParser::from_format(RdfFormat::NTriples);
-/// let quads = parser.parse_read(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+/// let quads = parser
+///     .parse_read(file.as_bytes())
+///     .collect::<Result<Vec<_>, _>>()?;
 ///
 /// assert_eq!(quads.len(), 1);
 /// assert_eq!(quads[0].subject.to_string(), "<http://example.com/s>");
@@ -129,9 +131,12 @@ impl RdfParser {
     /// The format the parser uses.
     ///
     /// ```
-    /// use oxrdfio::{RdfParser, RdfFormat};
+    /// use oxrdfio::{RdfFormat, RdfParser};
     ///
-    /// assert_eq!(RdfParser::from_format(RdfFormat::Turtle).format(), RdfFormat::Turtle);
+    /// assert_eq!(
+    ///     RdfParser::from_format(RdfFormat::Turtle).format(),
+    ///     RdfFormat::Turtle
+    /// );
     /// ```
     pub fn format(&self) -> RdfFormat {
         match &self.inner {
@@ -152,7 +157,9 @@ impl RdfParser {
     /// let file = "</s> </p> </o> .";
     ///
     /// let parser = RdfParser::from_format(RdfFormat::Turtle).with_base_iri("http://example.com")?;
-    /// let quads = parser.parse_read(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+    /// let quads = parser
+    ///     .parse_read(file.as_bytes())
+    ///     .collect::<Result<Vec<_>, _>>()?;
     ///
     /// assert_eq!(quads.len(), 1);
     /// assert_eq!(quads[0].subject.to_string(), "<http://example.com/s>");
@@ -179,8 +186,11 @@ impl RdfParser {
     ///
     /// let file = "<http://example.com/s> <http://example.com/p> <http://example.com/o> .";
     ///
-    /// let parser = RdfParser::from_format(RdfFormat::Turtle).with_default_graph(NamedNode::new("http://example.com/g")?);
+    /// let parser = RdfParser::from_format(RdfFormat::Turtle)
-    /// let quads = parser.parse_read(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+    ///     .with_default_graph(NamedNode::new("http://example.com/g")?);
+    /// let quads = parser
+    ///     .parse_read(file.as_bytes())
+    ///     .collect::<Result<Vec<_>, _>>()?;
     ///
     /// assert_eq!(quads.len(), 1);
     /// assert_eq!(quads[0].graph_name.to_string(), "<http://example.com/g>");
@@ -221,10 +231,12 @@ impl RdfParser {
     ///
     /// let result1 = RdfParser::from_format(RdfFormat::NQuads)
     ///     .rename_blank_nodes()
-    ///     .parse_read(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+    ///     .parse_read(file.as_bytes())
+    ///     .collect::<Result<Vec<_>, _>>()?;
     /// let result2 = RdfParser::from_format(RdfFormat::NQuads)
     ///     .rename_blank_nodes()
-    ///     .parse_read(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+    ///     .parse_read(file.as_bytes())
+    ///     .collect::<Result<Vec<_>, _>>()?;
     /// assert_ne!(result1, result2);
     /// # Result::<_,Box<dyn std::error::Error>>::Ok(())
     /// ```
@@ -262,7 +274,9 @@ impl RdfParser {
     /// let file = "<http://example.com/s> <http://example.com/p> <http://example.com/o> .";
     ///
     /// let parser = RdfParser::from_format(RdfFormat::NTriples);
-    /// let quads = parser.parse_read(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+    /// let quads = parser
+    ///     .parse_read(file.as_bytes())
+    ///     .collect::<Result<Vec<_>, _>>()?;
     ///
     /// assert_eq!(quads.len(), 1);
     /// assert_eq!(quads[0].subject.to_string(), "<http://example.com/s>");
@@ -358,7 +372,9 @@ impl From<RdfFormat> for RdfParser {
 /// let file = "<http://example.com/s> <http://example.com/p> <http://example.com/o> .";
 ///
 /// let parser = RdfParser::from_format(RdfFormat::NTriples);
-/// let quads = parser.parse_read(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+/// let quads = parser
+///     .parse_read(file.as_bytes())
+///     .collect::<Result<Vec<_>, _>>()?;
 ///
 /// assert_eq!(quads.len(), 1);
 /// assert_eq!(quads[0].subject.to_string(), "<http://example.com/s>");

lib/oxrdfio/src/serializer.rs

@@ -63,9 +63,12 @@ impl RdfSerializer {
     /// The format the serializer serializes to.
     ///
     /// ```
-    /// use oxrdfio::{RdfSerializer, RdfFormat};
+    /// use oxrdfio::{RdfFormat, RdfSerializer};
     ///
-    /// assert_eq!(RdfSerializer::from_format(RdfFormat::Turtle).format(), RdfFormat::Turtle);
+    /// assert_eq!(
+    ///     RdfSerializer::from_format(RdfFormat::Turtle).format(),
+    ///     RdfFormat::Turtle
+    /// );
     /// ```
     pub fn format(&self) -> RdfFormat {
         self.format

lib/oxrdfxml/src/parser.rs

@@ -26,7 +26,8 @@ use tokio::io::{AsyncRead, BufReader as AsyncBufReader};
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxrdfxml::RdfXmlParser;
 ///
 /// let file = br#"<?xml version="1.0"?>
@@ -84,7 +85,8 @@ impl RdfXmlParser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNodeRef, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNodeRef;
     /// use oxrdfxml::RdfXmlParser;
     ///
     /// let file = br#"<?xml version="1.0"?>
@@ -119,7 +121,8 @@ impl RdfXmlParser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNodeRef, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNodeRef;
     /// use oxrdfxml::RdfXmlParser;
     ///
     /// # #[tokio::main(flavor = "current_thread")]
@@ -179,7 +182,8 @@ impl RdfXmlParser {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxrdfxml::RdfXmlParser;
 ///
 /// let file = br#"<?xml version="1.0"?>
@@ -246,7 +250,8 @@ impl<R: Read> FromReadRdfXmlReader<R> {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxrdfxml::RdfXmlParser;
 ///
 /// # #[tokio::main(flavor = "current_thread")]

lib/oxsdatatypes/src/date_time.rs

@@ -17,6 +17,13 @@ pub struct DateTime {
 }
 
 impl DateTime {
+    pub const MAX: Self = Self {
+        timestamp: Timestamp::MAX,
+    };
+    pub const MIN: Self = Self {
+        timestamp: Timestamp::MIN,
+    };
+
     #[inline]
     pub(super) fn new(
         year: i64,
@@ -241,14 +248,6 @@ impl DateTime {
     pub fn is_identical_with(self, other: Self) -> bool {
         self.timestamp.is_identical_with(other.timestamp)
     }
-
-    pub const MIN: Self = Self {
-        timestamp: Timestamp::MIN,
-    };
-
-    pub const MAX: Self = Self {
-        timestamp: Timestamp::MAX,
-    };
 }
 
 /// Conversion according to [XPath cast rules](https://www.w3.org/TR/xpath-functions-31/#casting-to-datetimes).
@@ -317,6 +316,21 @@ pub struct Time {
 }
 
 impl Time {
+    #[cfg(test)]
+    const MAX: Self = Self {
+        timestamp: Timestamp {
+            value: Decimal::new_from_i128_unchecked(62_230_255_200),
+            timezone_offset: Some(TimezoneOffset::MIN),
+        },
+    };
+    #[cfg(test)]
+    const MIN: Self = Self {
+        timestamp: Timestamp {
+            value: Decimal::new_from_i128_unchecked(62_230_154_400),
+            timezone_offset: Some(TimezoneOffset::MAX),
+        },
+    };
+
     #[inline]
     fn new(
         mut hour: u8,
@@ -493,22 +507,6 @@ impl Time {
     pub fn is_identical_with(self, other: Self) -> bool {
         self.timestamp.is_identical_with(other.timestamp)
     }
-
-    #[cfg(test)]
-    const MIN: Self = Self {
-        timestamp: Timestamp {
-            value: Decimal::new_from_i128_unchecked(62_230_154_400),
-            timezone_offset: Some(TimezoneOffset::MAX),
-        },
-    };
-
-    #[cfg(test)]
-    const MAX: Self = Self {
-        timestamp: Timestamp {
-            value: Decimal::new_from_i128_unchecked(62_230_255_200),
-            timezone_offset: Some(TimezoneOffset::MIN),
-        },
-    };
 }
 
 /// Conversion according to [XPath cast rules](https://www.w3.org/TR/xpath-functions-31/#casting-to-datetimes).
@@ -566,6 +564,19 @@ pub struct Date {
 }
 
 impl Date {
+    pub const MAX: Self = Self {
+        timestamp: Timestamp {
+            value: Decimal::new_from_i128_unchecked(170_141_183_460_469_216_800),
+            timezone_offset: Some(TimezoneOffset::MAX),
+        },
+    };
+    pub const MIN: Self = Self {
+        timestamp: Timestamp {
+            value: Decimal::new_from_i128_unchecked(-170_141_183_460_469_216_800),
+            timezone_offset: Some(TimezoneOffset::MIN),
+        },
+    };
+
     #[inline]
     fn new(
         year: i64,
@@ -742,19 +753,6 @@ impl Date {
     pub fn is_identical_with(self, other: Self) -> bool {
         self.timestamp.is_identical_with(other.timestamp)
     }
-
-    pub const MIN: Self = Self {
-        timestamp: Timestamp {
-            value: Decimal::new_from_i128_unchecked(-170_141_183_460_469_216_800),
-            timezone_offset: Some(TimezoneOffset::MIN),
-        },
-    };
-    pub const MAX: Self = Self {
-        timestamp: Timestamp {
-            value: Decimal::new_from_i128_unchecked(170_141_183_460_469_216_800),
-            timezone_offset: Some(TimezoneOffset::MAX),
-        },
-    };
 }
 
 /// Conversion according to [XPath cast rules](https://www.w3.org/TR/xpath-functions-31/#casting-to-datetimes).
@@ -805,6 +803,19 @@ pub struct GYearMonth {
 }
 
 impl GYearMonth {
+    pub const MAX: Self = Self {
+        timestamp: Timestamp {
+            value: Decimal::new_from_i128_unchecked(170_141_183_460_469_216_800),
+            timezone_offset: Some(TimezoneOffset::MAX),
+        },
+    };
+    pub const MIN: Self = Self {
+        timestamp: Timestamp {
+            value: Decimal::new_from_i128_unchecked(-170_141_183_460_466_970_400),
+            timezone_offset: Some(TimezoneOffset::MIN),
+        },
+    };
+
     #[inline]
     fn new(
         year: i64,
@@ -876,19 +887,6 @@ impl GYearMonth {
     pub fn is_identical_with(self, other: Self) -> bool {
         self.timestamp.is_identical_with(other.timestamp)
     }
-
-    pub const MIN: Self = Self {
-        timestamp: Timestamp {
-            value: Decimal::new_from_i128_unchecked(-170_141_183_460_466_970_400),
-            timezone_offset: Some(TimezoneOffset::MIN),
-        },
-    };
-    pub const MAX: Self = Self {
-        timestamp: Timestamp {
-            value: Decimal::new_from_i128_unchecked(170_141_183_460_469_216_800),
-            timezone_offset: Some(TimezoneOffset::MAX),
-        },
-    };
 }
 
 /// Conversion according to [XPath cast rules](https://www.w3.org/TR/xpath-functions-31/#casting-to-datetimes).
@@ -947,6 +945,19 @@ pub struct GYear {
 }
 
 impl GYear {
+    pub const MAX: Self = Self {
+        timestamp: Timestamp {
+            value: Decimal::new_from_i128_unchecked(170_141_183_460_461_440_800),
+            timezone_offset: Some(TimezoneOffset::MAX),
+        },
+    };
+    pub const MIN: Self = Self {
+        timestamp: Timestamp {
+            value: Decimal::new_from_i128_unchecked(-170_141_183_460_461_700_000),
+            timezone_offset: Some(TimezoneOffset::MIN),
+        },
+    };
+
     #[inline]
     fn new(
         year: i64,
@@ -1011,19 +1022,6 @@ impl GYear {
     pub fn is_identical_with(self, other: Self) -> bool {
         self.timestamp.is_identical_with(other.timestamp)
     }
-
-    pub const MIN: Self = Self {
-        timestamp: Timestamp {
-            value: Decimal::new_from_i128_unchecked(-170_141_183_460_461_700_000),
-            timezone_offset: Some(TimezoneOffset::MIN),
-        },
-    };
-    pub const MAX: Self = Self {
-        timestamp: Timestamp {
-            value: Decimal::new_from_i128_unchecked(170_141_183_460_461_440_800),
-            timezone_offset: Some(TimezoneOffset::MAX),
-        },
-    };
 }
 
 /// Conversion according to [XPath cast rules](https://www.w3.org/TR/xpath-functions-31/#casting-to-datetimes).
@@ -1461,6 +1459,10 @@ pub struct TimezoneOffset {
 }
 
 impl TimezoneOffset {
+    pub const MAX: Self = Self { offset: 14 * 60 };
+    pub const MIN: Self = Self { offset: -14 * 60 };
+    pub const UTC: Self = Self { offset: 0 };
+
     /// From offset in minute with respect to UTC
     #[inline]
     pub fn new(offset_in_minutes: i16) -> Result<Self, InvalidTimezoneError> {
@@ -1489,10 +1491,6 @@ impl TimezoneOffset {
     pub fn to_be_bytes(self) -> [u8; 2] {
         self.offset.to_be_bytes()
     }
-
-    pub const MIN: Self = Self { offset: -14 * 60 };
-    pub const UTC: Self = Self { offset: 0 };
-    pub const MAX: Self = Self { offset: 14 * 60 };
 }
 
 impl TryFrom<DayTimeDuration> for TimezoneOffset {
@@ -1622,6 +1620,15 @@ impl Hash for Timestamp {
 }
 
 impl Timestamp {
+    pub const MAX: Self = Self {
+        value: Decimal::MAX,
+        timezone_offset: Some(TimezoneOffset::MAX),
+    };
+    pub const MIN: Self = Self {
+        value: Decimal::MIN,
+        timezone_offset: Some(TimezoneOffset::MIN),
+    };
+
     #[inline]
     fn new(props: &DateTimeSevenPropertyModel) -> Result<Self, DateTimeOverflowError> {
         Ok(Self {
@@ -1816,13 +1823,13 @@ impl Timestamp {
                 Self {
                     value: self
                         .value
-                        .checked_add(i64::from(from_timezone.offset) * 60)?, // We keep the literal value
+                        .checked_add(i64::from(from_timezone.offset) * 60)?, /* We keep the literal value */
                     timezone_offset: None,
                 }
             }
         } else if let Some(to_timezone) = timezone_offset {
             Self {
-                value: self.value.checked_sub(i64::from(to_timezone.offset) * 60)?, // We keep the literal value
+                value: self.value.checked_sub(i64::from(to_timezone.offset) * 60)?, /* We keep the literal value */
                 timezone_offset: Some(to_timezone),
             }
         } else {
@@ -1851,16 +1858,6 @@ impl Timestamp {
     pub fn is_identical_with(self, other: Self) -> bool {
         self.value == other.value && self.timezone_offset == other.timezone_offset
     }
-
-    pub const MIN: Self = Self {
-        value: Decimal::MIN,
-        timezone_offset: Some(TimezoneOffset::MIN),
-    };
-
-    pub const MAX: Self = Self {
-        value: Decimal::MAX,
-        timezone_offset: Some(TimezoneOffset::MAX),
-    };
 }
 
 #[cfg(feature = "custom-now")]

lib/oxsdatatypes/src/decimal.rs

@@ -19,6 +19,11 @@ pub struct Decimal {
 }
 
 impl Decimal {
+    pub const MAX: Self = Self { value: i128::MAX };
+    pub const MIN: Self = Self { value: i128::MIN };
+    #[cfg(test)]
+    pub const STEP: Self = Self { value: 1 };
+
     /// Constructs the decimal i / 10^n
     #[inline]
     pub const fn new(i: i128, n: u32) -> Result<Self, TooLargeForDecimalError> {
@@ -260,13 +265,6 @@ impl Decimal {
     pub(super) const fn as_i128(self) -> i128 {
         self.value / DECIMAL_PART_POW
     }
-
-    pub const MIN: Self = Self { value: i128::MIN };
-
-    pub const MAX: Self = Self { value: i128::MAX };
-
-    #[cfg(test)]
-    pub const STEP: Self = Self { value: 1 };
 }
 
 impl From<bool> for Decimal {

lib/oxsdatatypes/src/double.rs

@@ -17,6 +17,16 @@ pub struct Double {
 }
 
 impl Double {
+    pub const INFINITY: Self = Self {
+        value: f64::INFINITY,
+    };
+    pub const MAX: Self = Self { value: f64::MAX };
+    pub const MIN: Self = Self { value: f64::MIN };
+    pub const NAN: Self = Self { value: f64::NAN };
+    pub const NEG_INFINITY: Self = Self {
+        value: f64::NEG_INFINITY,
+    };
+
     #[inline]
     #[must_use]
     pub fn from_be_bytes(bytes: [u8; 8]) -> Self {
@@ -77,20 +87,6 @@ impl Double {
     pub fn is_identical_with(self, other: Self) -> bool {
         self.value.to_bits() == other.value.to_bits()
     }
-
-    pub const MIN: Self = Self { value: f64::MIN };
-
-    pub const MAX: Self = Self { value: f64::MAX };
-
-    pub const INFINITY: Self = Self {
-        value: f64::INFINITY,
-    };
-
-    pub const NEG_INFINITY: Self = Self {
-        value: f64::NEG_INFINITY,
-    };
-
-    pub const NAN: Self = Self { value: f64::NAN };
 }
 
 impl From<Double> for f64 {

lib/oxsdatatypes/src/duration.rs

@@ -15,6 +15,15 @@ pub struct Duration {
 }
 
 impl Duration {
+    pub const MAX: Self = Self {
+        year_month: YearMonthDuration::MAX,
+        day_time: DayTimeDuration::MAX,
+    };
+    pub const MIN: Self = Self {
+        year_month: YearMonthDuration::MIN,
+        day_time: DayTimeDuration::MIN,
+    };
+
     #[inline]
     pub fn new(
         months: impl Into<i64>,
@@ -160,16 +169,6 @@ impl Duration {
     pub fn is_identical_with(self, other: Self) -> bool {
         self == other
     }
-
-    pub const MIN: Self = Self {
-        year_month: YearMonthDuration::MIN,
-        day_time: DayTimeDuration::MIN,
-    };
-
-    pub const MAX: Self = Self {
-        year_month: YearMonthDuration::MAX,
-        day_time: DayTimeDuration::MAX,
-    };
 }
 
 impl TryFrom<StdDuration> for Duration {
@@ -301,6 +300,9 @@ pub struct YearMonthDuration {
 }
 
 impl YearMonthDuration {
+    pub const MAX: Self = Self { months: i64::MAX };
+    pub const MIN: Self = Self { months: i64::MIN };
+
     #[inline]
     pub fn new(months: impl Into<i64>) -> Self {
         Self {
@@ -374,10 +376,6 @@ impl YearMonthDuration {
     pub fn is_identical_with(self, other: Self) -> bool {
         self == other
     }
-
-    pub const MIN: Self = Self { months: i64::MIN };
-
-    pub const MAX: Self = Self { months: i64::MAX };
 }
 
 impl From<YearMonthDuration> for Duration {
@@ -469,6 +467,13 @@ pub struct DayTimeDuration {
 }
 
 impl DayTimeDuration {
+    pub const MAX: Self = Self {
+        seconds: Decimal::MAX,
+    };
+    pub const MIN: Self = Self {
+        seconds: Decimal::MIN,
+    };
+
     #[inline]
     pub fn new(seconds: impl Into<Decimal>) -> Self {
         Self {
@@ -558,14 +563,6 @@ impl DayTimeDuration {
     pub fn is_identical_with(self, other: Self) -> bool {
         self == other
     }
-
-    pub const MIN: Self = Self {
-        seconds: Decimal::MIN,
-    };
-
-    pub const MAX: Self = Self {
-        seconds: Decimal::MAX,
-    };
 }
 
 impl From<DayTimeDuration> for Duration {

lib/oxsdatatypes/src/float.rs

@@ -17,6 +17,16 @@ pub struct Float {
 }
 
 impl Float {
+    pub const INFINITY: Self = Self {
+        value: f32::INFINITY,
+    };
+    pub const MAX: Self = Self { value: f32::MAX };
+    pub const MIN: Self = Self { value: f32::MIN };
+    pub const NAN: Self = Self { value: f32::NAN };
+    pub const NEG_INFINITY: Self = Self {
+        value: f32::NEG_INFINITY,
+    };
+
     #[inline]
     #[must_use]
     pub fn from_be_bytes(bytes: [u8; 4]) -> Self {
@@ -77,20 +87,6 @@ impl Float {
     pub fn is_identical_with(self, other: Self) -> bool {
         self.value.to_bits() == other.value.to_bits()
     }
-
-    pub const MIN: Self = Self { value: f32::MIN };
-
-    pub const MAX: Self = Self { value: f32::MAX };
-
-    pub const INFINITY: Self = Self {
-        value: f32::INFINITY,
-    };
-
-    pub const NEG_INFINITY: Self = Self {
-        value: f32::NEG_INFINITY,
-    };
-
-    pub const NAN: Self = Self { value: f32::NAN };
 }
 
 impl From<Float> for f32 {

lib/oxsdatatypes/src/integer.rs

@@ -14,6 +14,9 @@ pub struct Integer {
 }
 
 impl Integer {
+    pub const MAX: Self = Self { value: i64::MAX };
+    pub const MIN: Self = Self { value: i64::MIN };
+
     #[inline]
     #[must_use]
     pub fn from_be_bytes(bytes: [u8; 8]) -> Self {
@@ -134,10 +137,6 @@ impl Integer {
     pub fn is_identical_with(self, other: Self) -> bool {
         self == other
     }
-
-    pub const MIN: Self = Self { value: i64::MIN };
-
-    pub const MAX: Self = Self { value: i64::MAX };
 }
 
 impl From<bool> for Integer {

lib/oxttl/src/lexer.rs

@@ -49,8 +49,8 @@ pub struct N3Lexer {
 // TODO: simplify by not giving is_end and fail with an "unexpected eof" is none is returned when is_end=true?
 
 impl TokenRecognizer for N3Lexer {
-    type Token<'a> = N3Token<'a>;
     type Options = N3LexerOptions;
+    type Token<'a> = N3Token<'a>;
 
     fn recognize_next_token<'a>(
         &mut self,

lib/oxttl/src/line_formats.rs

@@ -39,9 +39,9 @@ enum NQuadsState {
 }
 
 impl RuleRecognizer for NQuadsRecognizer {
-    type TokenRecognizer = N3Lexer;
-    type Output = Quad;
     type Context = NQuadsRecognizerContext;
+    type Output = Quad;
+    type TokenRecognizer = N3Lexer;
 
     fn error_recovery_state(mut self) -> Self {
         self.stack.clear();

lib/oxttl/src/n3.rs

@@ -181,7 +181,8 @@ impl From<Quad> for N3Quad {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNode, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNode;
 /// use oxttl::n3::{N3Parser, N3Term};
 ///
 /// let file = br#"@base <http://example.com/> .
@@ -260,7 +261,9 @@ impl N3Parser {
     /// <bar> a schema:Person ;
     ///     schema:name "Bar" ."#;
     ///
-    /// let rdf_type = N3Term::NamedNode(NamedNode::new("http://www.w3.org/1999/02/22-rdf-syntax-ns#type")?);
+    /// let rdf_type = N3Term::NamedNode(NamedNode::new(
+    ///     "http://www.w3.org/1999/02/22-rdf-syntax-ns#type",
+    /// )?);
     /// let schema_person = N3Term::NamedNode(NamedNode::new("http://schema.org/Person")?);
     /// let mut count = 0;
     /// for triple in N3Parser::new().parse_read(file.as_ref()) {
@@ -282,7 +285,8 @@ impl N3Parser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNode, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNode;
     /// use oxttl::n3::{N3Parser, N3Term};
     ///
     /// # #[tokio::main(flavor = "current_thread")]
@@ -322,14 +326,16 @@ impl N3Parser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNode, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNode;
     /// use oxttl::n3::{N3Parser, N3Term};
     ///
-    /// let file: [&[u8]; 5] = [b"@base <http://example.com/>",
+    /// let file: [&[u8]; 5] = [
+    ///     b"@base <http://example.com/>",
     ///     b". @prefix schema: <http://schema.org/> .",
     ///     b"<foo> a schema:Person",
     ///     b" ; schema:name \"Foo\" . <bar>",
-    ///     b" a schema:Person ; schema:name \"Bar\" ."
+    ///     b" a schema:Person ; schema:name \"Bar\" .",
     /// ];
     ///
     /// let rdf_type = N3Term::NamedNode(rdf::TYPE.into_owned());
@@ -366,7 +372,8 @@ impl N3Parser {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNode, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNode;
 /// use oxttl::n3::{N3Parser, N3Term};
 ///
 /// let file = br#"@base <http://example.com/> .
@@ -459,7 +466,8 @@ impl<R: Read> Iterator for FromReadN3Reader<R> {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNode, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNode;
 /// use oxttl::n3::{N3Parser, N3Term};
 ///
 /// # #[tokio::main(flavor = "current_thread")]
@@ -561,14 +569,16 @@ impl<R: AsyncRead + Unpin> FromTokioAsyncReadN3Reader<R> {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNode, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNode;
 /// use oxttl::n3::{N3Parser, N3Term};
 ///
-/// let file: [&[u8]; 5] = [b"@base <http://example.com/>",
+/// let file: [&[u8]; 5] = [
+///     b"@base <http://example.com/>",
 ///     b". @prefix schema: <http://schema.org/> .",
 ///     b"<foo> a schema:Person",
 ///     b" ; schema:name \"Foo\" . <bar>",
-///     b" a schema:Person ; schema:name \"Bar\" ."
+///     b" a schema:Person ; schema:name \"Bar\" .",
 /// ];
 ///
 /// let rdf_type = N3Term::NamedNode(rdf::TYPE.into_owned());
@@ -697,9 +707,9 @@ struct N3RecognizerContext {
 }
 
 impl RuleRecognizer for N3Recognizer {
-    type TokenRecognizer = N3Lexer;
-    type Output = N3Quad;
     type Context = N3RecognizerContext;
+    type Output = N3Quad;
+    type TokenRecognizer = N3Lexer;
 
     fn error_recovery_state(mut self) -> Self {
         self.stack.clear();

lib/oxttl/src/terse.rs

@@ -4,12 +4,10 @@ use crate::lexer::{resolve_local_name, N3Lexer, N3LexerMode, N3LexerOptions, N3T
 use crate::toolkit::{Lexer, Parser, RuleRecognizer, RuleRecognizerError};
 use crate::{MAX_BUFFER_SIZE, MIN_BUFFER_SIZE};
 use oxiri::Iri;
+use oxrdf::vocab::{rdf, xsd};
 #[cfg(feature = "rdf-star")]
 use oxrdf::Triple;
-use oxrdf::{
+use oxrdf::{BlankNode, GraphName, Literal, NamedNode, NamedOrBlankNode, Quad, Subject, Term};
-    vocab::{rdf, xsd},
-    BlankNode, GraphName, Literal, NamedNode, NamedOrBlankNode, Quad, Subject, Term,
-};
 use std::collections::HashMap;
 
 pub struct TriGRecognizer {
@@ -30,9 +28,9 @@ pub struct TriGRecognizerContext {
 }
 
 impl RuleRecognizer for TriGRecognizer {
-    type TokenRecognizer = N3Lexer;
-    type Output = Quad;
     type Context = TriGRecognizerContext;
+    type Output = Quad;
+    type TokenRecognizer = N3Lexer;
 
     fn error_recovery_state(mut self) -> Self {
         self.stack.clear();

lib/oxttl/src/trig.rs

@@ -6,7 +6,8 @@ use crate::terse::TriGRecognizer;
 use crate::toolkit::FromTokioAsyncReadIterator;
 use crate::toolkit::{FromReadIterator, ParseError, Parser, SyntaxError};
 use oxiri::{Iri, IriParseError};
-use oxrdf::{vocab::xsd, GraphName, NamedNode, Quad, QuadRef, Subject, TermRef};
+use oxrdf::vocab::xsd;
+use oxrdf::{GraphName, NamedNode, Quad, QuadRef, Subject, TermRef};
 use std::collections::HashMap;
 use std::fmt;
 use std::io::{self, Read, Write};
@@ -19,7 +20,8 @@ use tokio::io::{AsyncRead, AsyncWrite, AsyncWriteExt};
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxttl::TriGParser;
 ///
 /// let file = br#"@base <http://example.com/> .
@@ -97,7 +99,8 @@ impl TriGParser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNodeRef, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNodeRef;
     /// use oxttl::TriGParser;
     ///
     /// let file = br#"@base <http://example.com/> .
@@ -128,7 +131,8 @@ impl TriGParser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNodeRef, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNodeRef;
     /// use oxttl::TriGParser;
     ///
     /// # #[tokio::main(flavor = "current_thread")]
@@ -167,14 +171,16 @@ impl TriGParser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNodeRef, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNodeRef;
     /// use oxttl::TriGParser;
     ///
-    /// let file: [&[u8]; 5] = [b"@base <http://example.com/>",
+    /// let file: [&[u8]; 5] = [
+    ///     b"@base <http://example.com/>",
     ///     b". @prefix schema: <http://schema.org/> .",
     ///     b"<foo> a schema:Person",
     ///     b" ; schema:name \"Foo\" . <bar>",
-    ///     b" a schema:Person ; schema:name \"Bar\" ."
+    ///     b" a schema:Person ; schema:name \"Bar\" .",
     /// ];
     ///
     /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?;
@@ -217,7 +223,8 @@ impl TriGParser {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxttl::TriGParser;
 ///
 /// let file = br#"@base <http://example.com/> .
@@ -309,7 +316,8 @@ impl<R: Read> Iterator for FromReadTriGReader<R> {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxttl::TriGParser;
 ///
 /// # #[tokio::main(flavor = "current_thread")]
@@ -410,14 +418,16 @@ impl<R: AsyncRead + Unpin> FromTokioAsyncReadTriGReader<R> {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxttl::TriGParser;
 ///
-/// let file: [&[u8]; 5] = [b"@base <http://example.com/>",
+/// let file: [&[u8]; 5] = [
+///     b"@base <http://example.com/>",
 ///     b". @prefix schema: <http://schema.org/> .",
 ///     b"<foo> a schema:Person",
 ///     b" ; schema:name \"Foo\" . <bar>",
-///     b" a schema:Person ; schema:name \"Bar\" ."
+///     b" a schema:Person ; schema:name \"Bar\" .",
 /// ];
 ///
 /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?;

lib/oxttl/src/turtle.rs

@@ -21,7 +21,8 @@ use tokio::io::{AsyncRead, AsyncWrite};
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxttl::TurtleParser;
 ///
 /// let file = br#"@base <http://example.com/> .
@@ -99,7 +100,8 @@ impl TurtleParser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNodeRef, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNodeRef;
     /// use oxttl::TurtleParser;
     ///
     /// let file = br#"@base <http://example.com/> .
@@ -130,7 +132,8 @@ impl TurtleParser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNodeRef, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNodeRef;
     /// use oxttl::TurtleParser;
     ///
     /// # #[tokio::main(flavor = "current_thread")]
@@ -169,14 +172,16 @@ impl TurtleParser {
     ///
     /// Count the number of people:
     /// ```
-    /// use oxrdf::{NamedNodeRef, vocab::rdf};
+    /// use oxrdf::vocab::rdf;
+    /// use oxrdf::NamedNodeRef;
     /// use oxttl::TurtleParser;
     ///
-    /// let file: [&[u8]; 5] = [b"@base <http://example.com/>",
+    /// let file: [&[u8]; 5] = [
+    ///     b"@base <http://example.com/>",
     ///     b". @prefix schema: <http://schema.org/> .",
     ///     b"<foo> a schema:Person",
     ///     b" ; schema:name \"Foo\" . <bar>",
-    ///     b" a schema:Person ; schema:name \"Bar\" ."
+    ///     b" a schema:Person ; schema:name \"Bar\" .",
     /// ];
     ///
     /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?;
@@ -219,7 +224,8 @@ impl TurtleParser {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxttl::TurtleParser;
 ///
 /// let file = br#"@base <http://example.com/> .
@@ -311,7 +317,8 @@ impl<R: Read> Iterator for FromReadTurtleReader<R> {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxttl::TurtleParser;
 ///
 /// # #[tokio::main(flavor = "current_thread")]
@@ -412,14 +419,16 @@ impl<R: AsyncRead + Unpin> FromTokioAsyncReadTurtleReader<R> {
 ///
 /// Count the number of people:
 /// ```
-/// use oxrdf::{NamedNodeRef, vocab::rdf};
+/// use oxrdf::vocab::rdf;
+/// use oxrdf::NamedNodeRef;
 /// use oxttl::TurtleParser;
 ///
-/// let file: [&[u8]; 5] = [b"@base <http://example.com/>",
+/// let file: [&[u8]; 5] = [
+///     b"@base <http://example.com/>",
 ///     b". @prefix schema: <http://schema.org/> .",
 ///     b"<foo> a schema:Person",
 ///     b" ; schema:name \"Foo\" . <bar>",
-///     b" a schema:Person ; schema:name \"Bar\" ."
+///     b" a schema:Person ; schema:name \"Bar\" .",
 /// ];
 ///
 /// let schema_person = NamedNodeRef::new("http://schema.org/Person")?;

lib/sparesults/src/csv.rs

@@ -2,8 +2,8 @@
 
 use crate::error::{ParseError, SyntaxError, SyntaxErrorKind, TextPosition};
 use memchr::memchr;
-use oxrdf::Variable;
+use oxrdf::vocab::xsd;
-use oxrdf::{vocab::xsd, *};
+use oxrdf::*;
 use std::io::{self, Read, Write};
 use std::str::{self, FromStr};
 #[cfg(feature = "async-tokio")]

lib/sparesults/src/format.rs

@@ -20,7 +20,10 @@ impl QueryResultsFormat {
     /// ```
     /// use sparesults::QueryResultsFormat;
     ///
-    /// assert_eq!(QueryResultsFormat::Json.iri(), "http://www.w3.org/ns/formats/SPARQL_Results_JSON")
+    /// assert_eq!(
+    ///     QueryResultsFormat::Json.iri(),
+    ///     "http://www.w3.org/ns/formats/SPARQL_Results_JSON"
+    /// )
     /// ```
     #[inline]
     pub fn iri(self) -> &'static str {
@@ -31,12 +34,16 @@ impl QueryResultsFormat {
             Self::Tsv => "http://www.w3.org/ns/formats/SPARQL_Results_TSV",
         }
     }
+
     /// The format [IANA media type](https://tools.ietf.org/html/rfc2046).
     ///
     /// ```
     /// use sparesults::QueryResultsFormat;
     ///
-    /// assert_eq!(QueryResultsFormat::Json.media_type(), "application/sparql-results+json")
+    /// assert_eq!(
+    ///     QueryResultsFormat::Json.media_type(),
+    ///     "application/sparql-results+json"
+    /// )
     /// ```
     #[inline]
     pub fn media_type(self) -> &'static str {
@@ -91,7 +98,10 @@ impl QueryResultsFormat {
     /// ```
     /// use sparesults::QueryResultsFormat;
     ///
-    /// assert_eq!(QueryResultsFormat::from_media_type("application/sparql-results+json; charset=utf-8"), Some(QueryResultsFormat::Json))
+    /// assert_eq!(
+    ///     QueryResultsFormat::from_media_type("application/sparql-results+json; charset=utf-8"),
+    ///     Some(QueryResultsFormat::Json)
+    /// )
     /// ```
     #[inline]
     pub fn from_media_type(media_type: &str) -> Option<Self> {
@@ -134,7 +144,10 @@ impl QueryResultsFormat {
     /// ```
     /// use sparesults::QueryResultsFormat;
     ///
-    /// assert_eq!(QueryResultsFormat::from_extension("json"), Some(QueryResultsFormat::Json))
+    /// assert_eq!(
+    ///     QueryResultsFormat::from_extension("json"),
+    ///     Some(QueryResultsFormat::Json)
+    /// )
     /// ```
     #[inline]
     pub fn from_extension(extension: &str) -> Option<Self> {

lib/sparesults/src/json.rs

@@ -5,7 +5,6 @@ use crate::error::{ParseError, SyntaxError};
 use json_event_parser::ToTokioAsyncWriteJsonWriter;
 use json_event_parser::{FromReadJsonReader, JsonEvent, ToWriteJsonWriter};
 use oxrdf::vocab::rdf;
-use oxrdf::Variable;
 use oxrdf::*;
 use std::collections::BTreeMap;
 use std::io::{self, Read, Write};

lib/sparesults/src/parser.rs

@@ -130,8 +130,8 @@ impl From<QueryResultsFormat> for QueryResultsParser {
 ///
 /// Example in TSV (the API is the same for JSON and XML):
 /// ```
-/// use sparesults::{QueryResultsFormat, QueryResultsParser, FromReadQueryResultsReader};
 /// use oxrdf::{Literal, Variable};
+/// use sparesults::{FromReadQueryResultsReader, QueryResultsFormat, QueryResultsParser};
 ///
 /// let json_parser = QueryResultsParser::from_format(QueryResultsFormat::Tsv);
 ///
@@ -141,10 +141,24 @@ impl From<QueryResultsFormat> for QueryResultsParser {
 /// }
 ///
 /// // solutions
-/// if let FromReadQueryResultsReader::Solutions(solutions) = json_parser.parse_read(b"?foo\t?bar\n\"test\"\t".as_slice())? {
+/// if let FromReadQueryResultsReader::Solutions(solutions) =
-///     assert_eq!(solutions.variables(), &[Variable::new_unchecked("foo"), Variable::new_unchecked("bar")]);
+///     json_parser.parse_read(b"?foo\t?bar\n\"test\"\t".as_slice())?
+/// {
+///     assert_eq!(
+///         solutions.variables(),
+///         &[
+///             Variable::new_unchecked("foo"),
+///             Variable::new_unchecked("bar")
+///         ]
+///     );
 ///     for solution in solutions {
-///         assert_eq!(solution?.iter().collect::<Vec<_>>(), vec![(&Variable::new_unchecked("foo"), &Literal::from("test").into())]);
+///         assert_eq!(
+///             solution?.iter().collect::<Vec<_>>(),
+///             vec![(
+///                 &Variable::new_unchecked("foo"),
+///                 &Literal::from("test").into()
+///             )]
+///         );
 ///     }
 /// }
 /// # Result::<(),sparesults::ParseError>::Ok(())
@@ -188,12 +202,20 @@ impl<R: Read> FromReadSolutionsReader<R> {
     ///
     /// Example in TSV (the API is the same for JSON and XML):
     /// ```
-    /// use sparesults::{QueryResultsFormat, QueryResultsParser, FromReadQueryResultsReader};
     /// use oxrdf::Variable;
+    /// use sparesults::{FromReadQueryResultsReader, QueryResultsFormat, QueryResultsParser};
     ///
     /// let json_parser = QueryResultsParser::from_format(QueryResultsFormat::Tsv);
-    /// if let FromReadQueryResultsReader::Solutions(solutions) = json_parser.parse_read(b"?foo\t?bar\n\"ex1\"\t\"ex2\"".as_slice())? {
+    /// if let FromReadQueryResultsReader::Solutions(solutions) =
-    ///     assert_eq!(solutions.variables(), &[Variable::new_unchecked("foo"), Variable::new_unchecked("bar")]);
+    ///     json_parser.parse_read(b"?foo\t?bar\n\"ex1\"\t\"ex2\"".as_slice())?
+    /// {
+    ///     assert_eq!(
+    ///         solutions.variables(),
+    ///         &[
+    ///             Variable::new_unchecked("foo"),
+    ///             Variable::new_unchecked("bar")
+    ///         ]
+    ///     );
     /// }
     /// # Result::<(),sparesults::ParseError>::Ok(())
     /// ```

lib/sparesults/src/serializer.rs

@@ -241,14 +241,23 @@ impl From<QueryResultsFormat> for QueryResultsSerializer {
 ///
 /// Example in TSV (the API is the same for JSON, XML and CSV):
 /// ```
-/// use sparesults::{QueryResultsFormat, QueryResultsSerializer};
 /// use oxrdf::{LiteralRef, Variable, VariableRef};
+/// use sparesults::{QueryResultsFormat, QueryResultsSerializer};
 /// use std::iter::once;
 ///
 /// let tsv_serializer = QueryResultsSerializer::from_format(QueryResultsFormat::Tsv);
 /// let mut buffer = Vec::new();
-/// let mut writer = tsv_serializer.serialize_solutions_to_write(&mut buffer, vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")])?;
+/// let mut writer = tsv_serializer.serialize_solutions_to_write(
-/// writer.write(once((VariableRef::new_unchecked("foo"), LiteralRef::from("test"))))?;
+///     &mut buffer,
+///     vec![
+///         Variable::new_unchecked("foo"),
+///         Variable::new_unchecked("bar"),
+///     ],
+/// )?;
+/// writer.write(once((
+///     VariableRef::new_unchecked("foo"),
+///     LiteralRef::from("test"),
+/// )))?;
 /// writer.finish()?;
 /// assert_eq!(buffer, b"?foo\t?bar\n\"test\"\t\n");
 /// # std::io::Result::Ok(())
@@ -321,16 +330,29 @@ impl<W: Write> ToWriteSolutionsWriter<W> {
 ///
 /// Example in TSV (the API is the same for JSON, CSV and XML):
 /// ```
-/// use sparesults::{QueryResultsFormat, QueryResultsSerializer};
 /// use oxrdf::{LiteralRef, Variable, VariableRef};
+/// use sparesults::{QueryResultsFormat, QueryResultsSerializer};
 /// use std::iter::once;
 ///
 /// # #[tokio::main(flavor = "current_thread")]
 /// # async fn main() -> std::io::Result<()> {
 /// let tsv_serializer = QueryResultsSerializer::from_format(QueryResultsFormat::Tsv);
 /// let mut buffer = Vec::new();
-/// let mut writer = tsv_serializer.serialize_solutions_to_tokio_async_write(&mut buffer, vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")]).await?;
+/// let mut writer = tsv_serializer
-/// writer.write(once((VariableRef::new_unchecked("foo"), LiteralRef::from("test")))).await?;
+///     .serialize_solutions_to_tokio_async_write(
+///         &mut buffer,
+///         vec![
+///             Variable::new_unchecked("foo"),
+///             Variable::new_unchecked("bar"),
+///         ],
+///     )
+///     .await?;
+/// writer
+///     .write(once((
+///         VariableRef::new_unchecked("foo"),
+///         LiteralRef::from("test"),
+///     )))
+///     .await?;
 /// writer.finish().await?;
 /// assert_eq!(buffer, b"?foo\t?bar\n\"test\"\t\n");
 /// # Ok(())

lib/sparesults/src/solution.rs

@@ -44,10 +44,16 @@ impl QuerySolution {
     /// It is also the number of columns in the solutions table.
     ///
     /// ```
+    /// use oxrdf::{Literal, Variable};
     /// use sparesults::QuerySolution;
-    /// use oxrdf::{Variable, Literal};
     ///
-    /// let solution = QuerySolution::from((vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")], vec![Some(Literal::from(1).into()), None]));
+    /// let solution = QuerySolution::from((
+    ///     vec![
+    ///         Variable::new_unchecked("foo"),
+    ///         Variable::new_unchecked("bar"),
+    ///     ],
+    ///     vec![Some(Literal::from(1).into()), None],
+    /// ));
     /// assert_eq!(solution.len(), 2);
     /// ```
     #[inline]
@@ -58,13 +64,25 @@ impl QuerySolution {
     /// Is there any variable bound in the table?
     ///
     /// ```
+    /// use oxrdf::{Literal, Variable};
     /// use sparesults::QuerySolution;
-    /// use oxrdf::{Variable, Literal};
     ///
-    /// let solution = QuerySolution::from((vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")], vec![Some(Literal::from(1).into()), None]));
+    /// let solution = QuerySolution::from((
+    ///     vec![
+    ///         Variable::new_unchecked("foo"),
+    ///         Variable::new_unchecked("bar"),
+    ///     ],
+    ///     vec![Some(Literal::from(1).into()), None],
+    /// ));
     /// assert!(!solution.is_empty());
     ///
-    /// let empty_solution = QuerySolution::from((vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")], vec![None, None]));
+    /// let empty_solution = QuerySolution::from((
+    ///     vec![
+    ///         Variable::new_unchecked("foo"),
+    ///         Variable::new_unchecked("bar"),
+    ///     ],
+    ///     vec![None, None],
+    /// ));
     /// assert!(empty_solution.is_empty());
     /// ```
     #[inline]
@@ -75,11 +93,20 @@ impl QuerySolution {
     /// Returns an iterator over bound variables.
     ///
     /// ```
+    /// use oxrdf::{Literal, Variable};
     /// use sparesults::QuerySolution;
-    /// use oxrdf::{Variable, Literal};
     ///
-    /// let solution = QuerySolution::from((vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")], vec![Some(Literal::from(1).into()), None]));
+    /// let solution = QuerySolution::from((
-    /// assert_eq!(solution.iter().collect::<Vec<_>>(), vec![(&Variable::new_unchecked("foo"), &Literal::from(1).into())]);
+    ///     vec![
+    ///         Variable::new_unchecked("foo"),
+    ///         Variable::new_unchecked("bar"),
+    ///     ],
+    ///     vec![Some(Literal::from(1).into()), None],
+    /// ));
+    /// assert_eq!(
+    ///     solution.iter().collect::<Vec<_>>(),
+    ///     vec![(&Variable::new_unchecked("foo"), &Literal::from(1).into())]
+    /// );
     /// ```
     #[inline]
     pub fn iter(&self) -> impl Iterator<Item = (&Variable, &Term)> {
@@ -89,10 +116,16 @@ impl QuerySolution {
     /// Returns the ordered slice of variable values.
     ///
     /// ```
+    /// use oxrdf::{Literal, Variable};
     /// use sparesults::QuerySolution;
-    /// use oxrdf::{Variable, Literal};
     ///
-    /// let solution = QuerySolution::from((vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")], vec![Some(Literal::from(1).into()), None]));
+    /// let solution = QuerySolution::from((
+    ///     vec![
+    ///         Variable::new_unchecked("foo"),
+    ///         Variable::new_unchecked("bar"),
+    ///     ],
+    ///     vec![Some(Literal::from(1).into()), None],
+    /// ));
     /// assert_eq!(solution.values(), &[Some(Literal::from(1).into()), None]);
     /// ```
     #[inline]
@@ -103,11 +136,23 @@ impl QuerySolution {
     /// Returns the ordered slice of the solution variables, bound or not.
     ///
     /// ```
+    /// use oxrdf::{Literal, Variable};
     /// use sparesults::QuerySolution;
-    /// use oxrdf::{Variable, Literal};
     ///
-    /// let solution = QuerySolution::from((vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")], vec![Some(Literal::from(1).into()), None]));
+    /// let solution = QuerySolution::from((
-    /// assert_eq!(solution.variables(), &[Variable::new_unchecked("foo"), Variable::new_unchecked("bar")]);
+    ///     vec![
+    ///         Variable::new_unchecked("foo"),
+    ///         Variable::new_unchecked("bar"),
+    ///     ],
+    ///     vec![Some(Literal::from(1).into()), None],
+    /// ));
+    /// assert_eq!(
+    ///     solution.variables(),
+    ///     &[
+    ///         Variable::new_unchecked("foo"),
+    ///         Variable::new_unchecked("bar")
+    ///     ]
+    /// );
     /// ```
     #[inline]
     pub fn variables(&self) -> &[Variable] {
@@ -126,8 +171,8 @@ impl<V: Into<Arc<[Variable]>>, S: Into<Vec<Option<Term>>>> 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 {
@@ -214,11 +259,20 @@ impl fmt::Debug for QuerySolution {
 /// An iterator over [`QuerySolution`] bound variables.
 ///
 /// ```
+/// use oxrdf::{Literal, Variable};
 /// use sparesults::QuerySolution;
-/// use oxrdf::{Variable, Literal};
 ///
-/// let solution = QuerySolution::from((vec![Variable::new_unchecked("foo"), Variable::new_unchecked("bar")], vec![Some(Literal::from(1).into()), None]));
+/// let solution = QuerySolution::from((
-/// assert_eq!(solution.iter().collect::<Vec<_>>(), vec![(&Variable::new_unchecked("foo"), &Literal::from(1).into())]);
+///     vec![
+///         Variable::new_unchecked("foo"),
+///         Variable::new_unchecked("bar"),
+///     ],
+///     vec![Some(Literal::from(1).into()), None],
+/// ));
+/// assert_eq!(
+///     solution.iter().collect::<Vec<_>>(),
+///     vec![(&Variable::new_unchecked("foo"), &Literal::from(1).into())]
+/// );
 /// ```
 pub struct Iter<'a> {
     inner: Zip<std::slice::Iter<'a, Variable>, std::slice::Iter<'a, Option<Term>>>,

lib/sparesults/src/xml.rs

@@ -2,7 +2,6 @@
 
 use crate::error::{ParseError, SyntaxError};
 use oxrdf::vocab::rdf;
-use oxrdf::Variable;
 use oxrdf::*;
 use quick_xml::events::{BytesDecl, BytesEnd, BytesStart, BytesText, Event};
 use quick_xml::{Reader, Writer};

lib/spargebra/src/query.rs

@@ -13,7 +13,10 @@ use std::str::FromStr;
 /// let query_str = "SELECT ?s ?p ?o WHERE { ?s ?p ?o . }";
 /// let query = Query::parse(query_str, None)?;
 /// assert_eq!(query.to_string(), query_str);
-/// assert_eq!(query.to_sse(), "(project (?s ?p ?o) (bgp (triple ?s ?p ?o)))");
+/// assert_eq!(
+///     query.to_sse(),
+///     "(project (?s ?p ?o) (bgp (triple ?s ?p ?o)))"
+/// );
 /// # Ok::<_, spargebra::ParseError>(())
 /// ```
 #[derive(Eq, PartialEq, Debug, Clone, Hash)]

lib/spargebra/src/term.rs

@@ -141,7 +141,7 @@ impl TryFrom<Term> for GroundTerm {
 /// The default string formatter is returning a N-Quads representation.
 ///
 /// ```
-/// use spargebra::term::{NamedNode, GroundTriple};
+/// use spargebra::term::{GroundTriple, NamedNode};
 ///
 /// assert_eq!(
 ///     "<http://example.com/s> <http://example.com/p> <http://example.com/o>",
@@ -149,7 +149,8 @@ impl TryFrom<Term> for GroundTerm {
 ///         subject: NamedNode::new("http://example.com/s")?.into(),
 ///         predicate: NamedNode::new("http://example.com/p")?,
 ///         object: NamedNode::new("http://example.com/o")?.into(),
-///     }.to_string()
+///     }
+///     .to_string()
 /// );
 /// # Result::<_,oxrdf::IriParseError>::Ok(())
 /// ```

lib/sparopt/src/type_inference.rs

@@ -352,24 +352,14 @@ pub struct VariableType {
 }
 
 impl VariableType {
-    pub const UNDEF: Self = Self {
+    const ANY: Self = Self {
         undef: true,
-        named_node: false,
-        blank_node: false,
-        literal: false,
-        #[cfg(feature = "rdf-star")]
-        triple: false,
-    };
-
-    const NAMED_NODE: Self = Self {
-        undef: false,
         named_node: true,
-        blank_node: false,
+        blank_node: true,
-        literal: false,
+        literal: true,
         #[cfg(feature = "rdf-star")]
-        triple: false,
+        triple: true,
     };
-
     const BLANK_NODE: Self = Self {
         undef: false,
         named_node: false,
@@ -378,7 +368,6 @@ impl VariableType {
         #[cfg(feature = "rdf-star")]
         triple: false,
     };
-
     const LITERAL: Self = Self {
         undef: false,
         named_node: false,
@@ -387,16 +376,14 @@ impl VariableType {
         #[cfg(feature = "rdf-star")]
         triple: false,
     };
-
+    const NAMED_NODE: Self = Self {
-    #[cfg(feature = "rdf-star")]
-    const TRIPLE: Self = Self {
         undef: false,
-        named_node: false,
+        named_node: true,
         blank_node: false,
         literal: false,
-        triple: true,
+        #[cfg(feature = "rdf-star")]
+        triple: false,
     };
-
     const SUBJECT: Self = Self {
         undef: false,
         named_node: true,
@@ -405,7 +392,6 @@ impl VariableType {
         #[cfg(feature = "rdf-star")]
         triple: true,
     };
-
     const TERM: Self = Self {
         undef: false,
         named_node: true,
@@ -414,15 +400,22 @@ impl VariableType {
         #[cfg(feature = "rdf-star")]
         triple: true,
     };
-
-    const ANY: Self = Self {
-        undef: true,
-        named_node: true,
-        blank_node: true,
-        literal: true,
     #[cfg(feature = "rdf-star")]
+    const TRIPLE: Self = Self {
+        undef: false,
+        named_node: false,
+        blank_node: false,
+        literal: false,
         triple: true,
     };
+    pub const UNDEF: Self = Self {
+        undef: true,
+        named_node: false,
+        blank_node: false,
+        literal: false,
+        #[cfg(feature = "rdf-star")]
+        triple: false,
+    };
 }
 
 impl BitOr for VariableType {

lib/sparql-smith/src/lib.rs

@@ -1591,9 +1591,9 @@ struct IriOrFunction {
 impl fmt::Display for IriOrFunction {
     fn fmt(&self, f: &mut fmt::Formatter<'_>) -> fmt::Result {
         write!(f, "{}", self.iri)?;
-        /*if let Some(args) = &self.args {
+        // if let Some(args) = &self.args {
-            write!(f, "{}", args)?;
+        // write!(f, "{}", args)?;
-        }*/
+        // }
         Ok(())
     }
 }

lib/src/io/format.rs

@@ -23,7 +23,10 @@ impl GraphFormat {
     /// ```
     /// use oxigraph::io::GraphFormat;
     ///
-    /// assert_eq!(GraphFormat::NTriples.iri(), "http://www.w3.org/ns/formats/N-Triples")
+    /// assert_eq!(
+    ///     GraphFormat::NTriples.iri(),
+    ///     "http://www.w3.org/ns/formats/N-Triples"
+    /// )
     /// ```
     #[inline]
     pub fn iri(self) -> &'static str {
@@ -65,6 +68,7 @@ impl GraphFormat {
             Self::RdfXml => "rdf",
         }
     }
+
     /// Looks for a known format from a media type.
     ///
     /// It supports some media type aliases.
@@ -74,7 +78,10 @@ impl GraphFormat {
     /// ```
     /// use oxigraph::io::GraphFormat;
     ///
-    /// assert_eq!(GraphFormat::from_media_type("text/turtle; charset=utf-8"), Some(GraphFormat::Turtle))
+    /// assert_eq!(
+    ///     GraphFormat::from_media_type("text/turtle; charset=utf-8"),
+    ///     Some(GraphFormat::Turtle)
+    /// )
     /// ```
     #[inline]
     pub fn from_media_type(media_type: &str) -> Option<Self> {
@@ -94,7 +101,10 @@ impl GraphFormat {
     /// ```
     /// use oxigraph::io::GraphFormat;
     ///
-    /// assert_eq!(GraphFormat::from_extension("nt"), Some(GraphFormat::NTriples))
+    /// assert_eq!(
+    ///     GraphFormat::from_extension("nt"),
+    ///     Some(GraphFormat::NTriples)
+    /// )
     /// ```
     #[inline]
     pub fn from_extension(extension: &str) -> Option<Self> {
@@ -151,7 +161,10 @@ impl DatasetFormat {
     /// ```
     /// use oxigraph::io::DatasetFormat;
     ///
-    /// assert_eq!(DatasetFormat::NQuads.iri(), "http://www.w3.org/ns/formats/N-Quads")
+    /// assert_eq!(
+    ///     DatasetFormat::NQuads.iri(),
+    ///     "http://www.w3.org/ns/formats/N-Quads"
+    /// )
     /// ```
     #[inline]
     pub fn iri(self) -> &'static str {
@@ -190,6 +203,7 @@ impl DatasetFormat {
             Self::TriG => "trig",
         }
     }
+
     /// Looks for a known format from a media type.
     ///
     /// It supports some media type aliases.
@@ -198,7 +212,10 @@ impl DatasetFormat {
     /// ```
     /// use oxigraph::io::DatasetFormat;
     ///
-    /// assert_eq!(DatasetFormat::from_media_type("application/n-quads; charset=utf-8"), Some(DatasetFormat::NQuads))
+    /// assert_eq!(
+    ///     DatasetFormat::from_media_type("application/n-quads; charset=utf-8"),
+    ///     Some(DatasetFormat::NQuads)
+    /// )
     /// ```
     #[inline]
     pub fn from_media_type(media_type: &str) -> Option<Self> {
@@ -217,7 +234,10 @@ impl DatasetFormat {
     /// ```
     /// use oxigraph::io::DatasetFormat;
     ///
-    /// assert_eq!(DatasetFormat::from_extension("nq"), Some(DatasetFormat::NQuads))
+    /// assert_eq!(
+    ///     DatasetFormat::from_extension("nq"),
+    ///     Some(DatasetFormat::NQuads)
+    /// )
     /// ```
     #[inline]
     pub fn from_extension(extension: &str) -> Option<Self> {

lib/src/io/read.rs

@@ -21,7 +21,9 @@ use std::io::Read;
 /// let file = "<http://example.com/s> <http://example.com/p> <http://example.com/o> .";
 ///
 /// let parser = GraphParser::from_format(GraphFormat::NTriples);
-/// let triples = parser.read_triples(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+/// let triples = parser
+///     .read_triples(file.as_bytes())
+///     .collect::<Result<Vec<_>, _>>()?;
 ///
 /// assert_eq!(triples.len(), 1);
 /// assert_eq!(triples[0].subject.to_string(), "<http://example.com/s>");
@@ -50,8 +52,11 @@ impl GraphParser {
     ///
     /// let file = "</s> </p> </o> .";
     ///
-    /// let parser = GraphParser::from_format(GraphFormat::Turtle).with_base_iri("http://example.com")?;
+    /// let parser =
-    /// let triples = parser.read_triples(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+    ///     GraphParser::from_format(GraphFormat::Turtle).with_base_iri("http://example.com")?;
+    /// let triples = parser
+    ///     .read_triples(file.as_bytes())
+    ///     .collect::<Result<Vec<_>, _>>()?;
     ///
     /// assert_eq!(triples.len(), 1);
     /// assert_eq!(triples[0].subject.to_string(), "<http://example.com/s>");
@@ -81,7 +86,9 @@ impl GraphParser {
 /// let file = "<http://example.com/s> <http://example.com/p> <http://example.com/o> .";
 ///
 /// let parser = GraphParser::from_format(GraphFormat::NTriples);
-/// let triples = parser.read_triples(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+/// let triples = parser
+///     .read_triples(file.as_bytes())
+///     .collect::<Result<Vec<_>, _>>()?;
 ///
 /// assert_eq!(triples.len(), 1);
 /// assert_eq!(triples[0].subject.to_string(), "<http://example.com/s>");
@@ -139,8 +146,11 @@ impl DatasetParser {
     ///
     /// let file = "<g> { </s> </p> </o> }";
     ///
-    /// let parser = DatasetParser::from_format(DatasetFormat::TriG).with_base_iri("http://example.com")?;
+    /// let parser =
-    /// let triples = parser.read_quads(file.as_bytes()).collect::<Result<Vec<_>,_>>()?;
+    ///     DatasetParser::from_format(DatasetFormat::TriG).with_base_iri("http://example.com")?;
+    /// let triples = parser
+    ///     .read_quads(file.as_bytes())
+    ///     .collect::<Result<Vec<_>, _>>()?;
     ///
     /// assert_eq!(triples.len(), 1);
     /// assert_eq!(triples[0].subject.to_string(), "<http://example.com/s>");

lib/src/io/write.rs

@@ -23,11 +23,14 @@ use std::io::{self, Write};
 /// writer.write(&Triple {
 ///     subject: NamedNode::new("http://example.com/s")?.into(),
 ///     predicate: NamedNode::new("http://example.com/p")?,
-///    object: NamedNode::new("http://example.com/o")?.into()
+///     object: NamedNode::new("http://example.com/o")?.into(),
 /// })?;
 /// writer.finish()?;
 ///
-/// assert_eq!(buffer.as_slice(), "<http://example.com/s> <http://example.com/p> <http://example.com/o> .\n".as_bytes());
+/// assert_eq!(
+///     buffer.as_slice(),
+///     "<http://example.com/s> <http://example.com/p> <http://example.com/o> .\n".as_bytes()
+/// );
 /// # Result::<_,Box<dyn std::error::Error>>::Ok(())
 /// ```
 #[deprecated(note = "use RdfSerializer instead", since = "0.4.0")]
@@ -68,11 +71,14 @@ impl GraphSerializer {
 /// writer.write(&Triple {
 ///     subject: NamedNode::new("http://example.com/s")?.into(),
 ///     predicate: NamedNode::new("http://example.com/p")?,
-///    object: NamedNode::new("http://example.com/o")?.into()
+///     object: NamedNode::new("http://example.com/o")?.into(),
 /// })?;
 /// writer.finish()?;
 ///
-/// assert_eq!(buffer.as_slice(), "<http://example.com/s> <http://example.com/p> <http://example.com/o> .\n".as_bytes());
+/// assert_eq!(
+///     buffer.as_slice(),
+///     "<http://example.com/s> <http://example.com/p> <http://example.com/o> .\n".as_bytes()
+/// );
 /// # Result::<_,Box<dyn std::error::Error>>::Ok(())
 /// ```
 #[must_use]

lib/src/sparql/algebra.rs

@@ -23,7 +23,10 @@ use std::str::FromStr;
 /// // We edit the query dataset specification
 /// let default = vec![NamedNode::new("http://example.com")?.into()];
 /// query.dataset_mut().set_default_graph(default.clone());
-/// assert_eq!(query.dataset().default_graph_graphs(), Some(default.as_slice()));
+/// assert_eq!(
+///     query.dataset().default_graph_graphs(),
+///     Some(default.as_slice())
+/// );
 /// # Ok::<_, Box<dyn std::error::Error>>(())
 /// ```
 #[derive(Eq, PartialEq, Debug, Clone, Hash)]
@@ -217,8 +220,15 @@ impl QueryDataset {
     /// ```
     /// use oxigraph::sparql::Query;
     ///
-    /// assert!(Query::parse("SELECT ?s ?p ?o WHERE { ?s ?p ?o . }", None)?.dataset().is_default_dataset());
+    /// assert!(Query::parse("SELECT ?s ?p ?o WHERE { ?s ?p ?o . }", None)?
-    /// assert!(!Query::parse("SELECT ?s ?p ?o FROM <http://example.com> WHERE { ?s ?p ?o . }", None)?.dataset().is_default_dataset());
+    ///     .dataset()
+    ///     .is_default_dataset());
+    /// assert!(!Query::parse(
+    ///     "SELECT ?s ?p ?o FROM <http://example.com> WHERE { ?s ?p ?o . }",
+    ///     None
+    /// )?
+    /// .dataset()
+    /// .is_default_dataset());
     ///
     /// # Ok::<_, Box<dyn std::error::Error>>(())
     /// ```
@@ -250,7 +260,10 @@ impl QueryDataset {
     /// let mut query = Query::parse("SELECT ?s ?p ?o WHERE { ?s ?p ?o . }", None)?;
     /// let default = vec![NamedNode::new("http://example.com")?.into()];
     /// query.dataset_mut().set_default_graph(default.clone());
-    /// assert_eq!(query.dataset().default_graph_graphs(), Some(default.as_slice()));    
+    /// assert_eq!(
+    ///     query.dataset().default_graph_graphs(),
+    ///     Some(default.as_slice())
+    /// );
     ///
     /// # Ok::<_, Box<dyn std::error::Error>>(())
     /// ```
@@ -271,8 +284,13 @@ impl QueryDataset {
     ///
     /// let mut query = Query::parse("SELECT ?s ?p ?o WHERE { ?s ?p ?o . }", None)?;
     /// let named = vec![NamedNode::new("http://example.com")?.into()];
-    /// query.dataset_mut().set_available_named_graphs(named.clone());
+    /// query
-    /// assert_eq!(query.dataset().available_named_graphs(), Some(named.as_slice()));
+    ///     .dataset_mut()
+    ///     .set_available_named_graphs(named.clone());
+    /// assert_eq!(
+    ///     query.dataset().available_named_graphs(),
+    ///     Some(named.as_slice())
+    /// );
     ///
     /// # Ok::<_, Box<dyn std::error::Error>>(())
     /// ```

lib/src/sparql/error.rs

@@ -5,8 +5,7 @@ use crate::sparql::ParseError;
 use crate::storage::StorageError;
 use std::convert::Infallible;
 use std::error::Error;
-use std::fmt;
+use std::{fmt, io};
-use std::io;
 
 /// A SPARQL evaluation error.
 #[derive(Debug)]

lib/src/sparql/eval.rs

@@ -33,8 +33,7 @@ use std::cmp::Ordering;
 use std::collections::hash_map::DefaultHasher;
 use std::collections::{HashMap, HashSet};
 use std::hash::{Hash, Hasher};
-use std::iter::Iterator;
+use std::iter::{empty, once, Iterator};
-use std::iter::{empty, once};
 use std::rc::Rc;
 use std::sync::Arc;
 use std::{fmt, io, str};
@@ -112,8 +111,8 @@ impl EncodedTuple {
 }
 
 impl IntoIterator for EncodedTuple {
-    type Item = Option<EncodedTerm>;
     type IntoIter = std::vec::IntoIter<Option<EncodedTerm>>;
+    type Item = Option<EncodedTerm>;
 
     fn into_iter(self) -> Self::IntoIter {
         self.inner.into_iter()
@@ -4387,6 +4386,7 @@ impl PathEvaluator {
             }
         }
     }
+
     fn eval_to_in_unknown_graph(
         &self,
         path: &PropertyPath,
@@ -5584,6 +5584,7 @@ impl EncodedTupleSet {
             len: 0,
         }
     }
+
     fn insert(&mut self, tuple: EncodedTuple) {
         self.map
             .entry(self.tuple_key(&tuple))

lib/src/sparql/mod.rs

@@ -144,13 +144,13 @@ pub(crate) fn evaluate_query(
 ///
 /// Usage example disabling the federated query support:
 /// ```
-/// use oxigraph::store::Store;
 /// use oxigraph::sparql::QueryOptions;
+/// use oxigraph::store::Store;
 ///
 /// let store = Store::new()?;
 /// store.query_opt(
 ///     "SELECT * WHERE { SERVICE <https://query.wikidata.org/sparql> {} }",
-///     QueryOptions::default().without_service_handler()
+///     QueryOptions::default().without_service_handler(),
 /// )?;
 /// # Result::<_,Box<dyn std::error::Error>>::Ok(())
 /// ```
@@ -209,9 +209,9 @@ impl QueryOptions {
     ///
     /// Example with a function serializing terms to N-Triples:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
     /// use oxigraph::sparql::{QueryOptions, QueryResults};
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
@@ -219,10 +219,13 @@ impl QueryOptions {
     ///     "SELECT (<http://www.w3.org/ns/formats/N-Triples>(1) AS ?nt) WHERE {}",
     ///     QueryOptions::default().with_custom_function(
     ///         NamedNode::new("http://www.w3.org/ns/formats/N-Triples")?,
-    ///         |args| args.get(0).map(|t| Literal::from(t.to_string()).into())
+    ///         |args| args.get(0).map(|t| Literal::from(t.to_string()).into()),
-    ///     )
+    ///     ),
     /// )? {
-    ///     assert_eq!(solutions.next().unwrap()?.get("nt"), Some(&Literal::from("\"1\"^^<http://www.w3.org/2001/XMLSchema#integer>").into()));
+    ///     assert_eq!(
+    ///         solutions.next().unwrap()?.get("nt"),
+    ///         Some(&Literal::from("\"1\"^^<http://www.w3.org/2001/XMLSchema#integer>").into())
+    ///     );
     /// }
     /// # Result::<_,Box<dyn std::error::Error>>::Ok(())
     /// ```

lib/src/sparql/model.rs

@@ -104,17 +104,24 @@ impl QueryResults {
     /// This method fails if it is called on the `Solution` or `Boolean` results.
     ///
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let graph = "<http://example.com> <http://example.com> <http://example.com> .\n";
     ///
     /// let store = Store::new()?;
-    /// store.load_graph(graph.as_bytes(), RdfFormat::NTriples, GraphName::DefaultGraph, None)?;
+    /// store.load_graph(
+    ///     graph.as_bytes(),
+    ///     RdfFormat::NTriples,
+    ///     GraphName::DefaultGraph,
+    ///     None,
+    /// )?;
     ///
     /// let mut results = Vec::new();
-    /// store.query("CONSTRUCT WHERE { ?s ?p ?o }")?.write_graph(&mut results, RdfFormat::NTriples)?;
+    /// store
+    ///     .query("CONSTRUCT WHERE { ?s ?p ?o }")?
+    ///     .write_graph(&mut results, RdfFormat::NTriples)?;
     /// assert_eq!(results, graph.as_bytes());
     /// # Result::<_,Box<dyn std::error::Error>>::Ok(())
     /// ```
@@ -159,8 +166,8 @@ impl<R: Read + 'static> From<FromReadQueryResultsReader<R>> for QueryResults {
 /// An iterator over [`QuerySolution`]s.
 ///
 /// ```
-/// use oxigraph::store::Store;
 /// use oxigraph::sparql::QueryResults;
+/// use oxigraph::store::Store;
 ///
 /// let store = Store::new()?;
 /// if let QueryResults::Solutions(solutions) = store.query("SELECT ?s WHERE { ?s ?p ?o }")? {
@@ -193,12 +200,15 @@ impl QuerySolutionIter {
     /// The variables used in the solutions.
     ///
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::sparql::{QueryResults, Variable};
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     /// if let QueryResults::Solutions(solutions) = store.query("SELECT ?s ?o WHERE { ?s ?p ?o }")? {
-    ///     assert_eq!(solutions.variables(), &[Variable::new("s")?, Variable::new("o")?]);
+    ///     assert_eq!(
+    ///         solutions.variables(),
+    ///         &[Variable::new("s")?, Variable::new("o")?]
+    ///     );
     /// }
     /// # Result::<_,Box<dyn std::error::Error>>::Ok(())
     /// ```
@@ -234,8 +244,8 @@ impl Iterator for QuerySolutionIter {
 /// An iterator over the triples that compose a graph solution.
 ///
 /// ```
-/// use oxigraph::store::Store;
 /// use oxigraph::sparql::QueryResults;
+/// use oxigraph::store::Store;
 ///
 /// let store = Store::new()?;
 /// if let QueryResults::Graph(triples) = store.query("CONSTRUCT WHERE { ?s ?p ?o }")? {

lib/src/sparql/service.rs

@@ -13,18 +13,22 @@ use std::time::Duration;
 /// before evaluating a SPARQL query that uses SERVICE calls.
 ///
 /// ```
-/// use oxigraph::store::Store;
 /// use oxigraph::model::*;
-/// use oxigraph::sparql::{QueryOptions, QueryResults, ServiceHandler, Query, EvaluationError};
+/// use oxigraph::sparql::{EvaluationError, Query, QueryOptions, QueryResults, ServiceHandler};
+/// use oxigraph::store::Store;
 ///
 /// struct TestServiceHandler {
-///     store: Store
+///     store: Store,
 /// }
 ///
 /// impl ServiceHandler for TestServiceHandler {
 ///     type Error = EvaluationError;
 ///
-///     fn handle(&self, service_name: NamedNode, query: Query) -> Result<QueryResults, Self::Error> {
+///     fn handle(
+///         &self,
+///         service_name: NamedNode,
+///         query: Query,
+///     ) -> Result<QueryResults, Self::Error> {
 ///         if service_name == "http://example.com/service" {
 ///             self.store.query(query)
 ///         } else {
@@ -35,14 +39,16 @@ use std::time::Duration;
 ///
 /// let store = Store::new()?;
 /// let service = TestServiceHandler {
-///     store: Store::new()?
+///     store: Store::new()?,
 /// };
 /// let ex = NamedNodeRef::new("http://example.com")?;
-/// service.store.insert(QuadRef::new(ex, ex, ex, GraphNameRef::DefaultGraph))?;
+/// service
+///     .store
+///     .insert(QuadRef::new(ex, ex, ex, GraphNameRef::DefaultGraph))?;
 ///
 /// if let QueryResults::Solutions(mut solutions) = store.query_opt(
 ///     "SELECT ?s WHERE { SERVICE <http://example.com/service> { ?s ?p ?o } }",
-///     QueryOptions::default().with_service_handler(service)
+///     QueryOptions::default().with_service_handler(service),
 /// )? {
 ///     assert_eq!(solutions.next().unwrap()?.get("s"), Some(&ex.into()));
 /// }

lib/src/storage/backend/rocksdb.rs

@@ -19,16 +19,14 @@ use std::collections::HashMap;
 use std::env::temp_dir;
 use std::error::Error;
 use std::ffi::{CStr, CString};
-use std::fmt;
 use std::fs::remove_dir_all;
-use std::io;
 use std::marker::PhantomData;
 use std::ops::Deref;
 use std::path::{Path, PathBuf};
 use std::rc::{Rc, Weak};
 use std::sync::{Arc, OnceLock};
 use std::thread::{available_parallelism, yield_now};
-use std::{ptr, slice};
+use std::{fmt, io, ptr, slice};
 
 macro_rules! ffi_result {
     ( $($function:ident)::*( $arg1:expr $(, $arg:expr)* $(,)? ) ) => {{
@@ -1228,7 +1226,7 @@ pub struct Iter {
     is_currently_valid: bool,
     _upper_bound: Option<Vec<u8>>,
     _reader: Reader, // needed to ensure that DB still lives while iter is used
-    options: *mut rocksdb_readoptions_t, // needed to ensure that options still lives while iter is used
+    options: *mut rocksdb_readoptions_t, /* needed to ensure that options still lives while iter is used */
 }
 
 impl Drop for Iter {

lib/src/storage/error.rs

@@ -1,8 +1,7 @@
 use crate::io::{ParseError, RdfFormat};
 use oxiri::IriParseError;
 use std::error::Error;
-use std::fmt;
+use std::{fmt, io};
-use std::io;
 
 /// An error related to storage operations (reads, writes...).
 #[derive(Debug)]

lib/src/storage/numeric_encoder.rs

@@ -6,8 +6,7 @@ use crate::storage::small_string::SmallString;
 use oxsdatatypes::*;
 use siphasher::sip128::{Hasher128, SipHasher24};
 use std::fmt::Debug;
-use std::hash::Hash;
+use std::hash::{Hash, Hasher};
-use std::hash::Hasher;
 use std::str;
 use std::sync::Arc;
 

lib/src/storage/small_string.rs

@@ -1,11 +1,10 @@
 use std::borrow::Borrow;
 use std::cmp::Ordering;
 use std::error::Error;
-use std::fmt;
 use std::hash::{Hash, Hasher};
 use std::ops::Deref;
-use std::str;
 use std::str::{FromStr, Utf8Error};
+use std::{fmt, str};
 
 /// A small inline string
 #[derive(Clone, Copy, Default)]

lib/src/store.rs

@@ -4,9 +4,9 @@
 //!
 //! Usage example:
 //! ```
-//! use oxigraph::store::Store;
-//! use oxigraph::sparql::QueryResults;
 //! use oxigraph::model::*;
+//! use oxigraph::sparql::QueryResults;
+//! use oxigraph::store::Store;
 //!
 //! let store = Store::new()?;
 //!
@@ -56,9 +56,9 @@ use std::{fmt, str};
 ///
 /// Usage example:
 /// ```
-/// use oxigraph::store::Store;
-/// use oxigraph::sparql::QueryResults;
 /// use oxigraph::model::*;
+/// use oxigraph::sparql::QueryResults;
+/// use oxigraph::store::Store;
 /// # use std::fs::remove_dir_all;
 ///
 /// # {
@@ -160,9 +160,9 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
     /// use oxigraph::sparql::QueryResults;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
@@ -172,7 +172,10 @@ impl Store {
     ///
     /// // SPARQL query
     /// if let QueryResults::Solutions(mut solutions) = store.query("SELECT ?s WHERE { ?s ?p ?o }")? {
-    ///     assert_eq!(solutions.next().unwrap()?.get("s"), Some(&ex.into_owned().into()));
+    ///     assert_eq!(
+    ///         solutions.next().unwrap()?.get("s"),
+    ///         Some(&ex.into_owned().into())
+    ///     );
     /// }
     /// # Result::<_, Box<dyn std::error::Error>>::Ok(())
     /// ```
@@ -187,19 +190,22 @@ impl Store {
     ///
     /// Usage example with a custom function serializing terms to N-Triples:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
     /// use oxigraph::sparql::{QueryOptions, QueryResults};
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     /// if let QueryResults::Solutions(mut solutions) = store.query_opt(
     ///     "SELECT (<http://www.w3.org/ns/formats/N-Triples>(1) AS ?nt) WHERE {}",
     ///     QueryOptions::default().with_custom_function(
     ///         NamedNode::new("http://www.w3.org/ns/formats/N-Triples")?,
-    ///         |args| args.get(0).map(|t| Literal::from(t.to_string()).into())
+    ///         |args| args.get(0).map(|t| Literal::from(t.to_string()).into()),
-    ///     )
+    ///     ),
     /// )? {
-    ///     assert_eq!(solutions.next().unwrap()?.get("nt"), Some(&Literal::from("\"1\"^^<http://www.w3.org/2001/XMLSchema#integer>").into()));
+    ///     assert_eq!(
+    ///         solutions.next().unwrap()?.get("nt"),
+    ///         Some(&Literal::from("\"1\"^^<http://www.w3.org/2001/XMLSchema#integer>").into())
+    ///     );
     /// }
     /// # Result::<_, Box<dyn std::error::Error>>::Ok(())
     /// ```
@@ -219,14 +225,17 @@ impl Store {
     ///
     /// Usage example serialising the explanation with statistics in JSON:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::sparql::{QueryOptions, QueryResults};
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
-    /// if let (Ok(QueryResults::Solutions(solutions)), explanation) =  store.explain_query_opt("SELECT ?s WHERE { VALUES ?s { 1 2 3 } }", QueryOptions::default(), true)? {
+    /// if let (Ok(QueryResults::Solutions(solutions)), explanation) = store.explain_query_opt(
+    ///     "SELECT ?s WHERE { VALUES ?s { 1 2 3 } }",
+    ///     QueryOptions::default(),
+    ///     true,
+    /// )? {
     ///     // We make sure to have read all the solutions
-    ///     for _ in solutions {
+    ///     for _ in solutions {}
-    ///     }
     ///     let mut buf = Vec::new();
     ///     explanation.write_in_json(&mut buf)?;
     /// }
@@ -245,8 +254,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
@@ -256,7 +265,9 @@ impl Store {
     /// store.insert(&quad)?;
     ///
     /// // quad filter by object
-    /// let results = store.quads_for_pattern(None, None, Some((&ex).into()), None).collect::<Result<Vec<_>,_>>()?;
+    /// let results = store
+    ///     .quads_for_pattern(None, None, Some((&ex).into()), None)
+    ///     .collect::<Result<Vec<_>, _>>()?;
     /// assert_eq!(vec![quad], results);
     /// # Result::<_, Box<dyn std::error::Error>>::Ok(())
     /// ```
@@ -283,8 +294,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
@@ -306,8 +317,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new("http://example.com")?;
     /// let quad = QuadRef::new(ex, ex, ex, ex);
@@ -330,8 +341,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new("http://example.com")?;
     /// let store = Store::new()?;
@@ -348,8 +359,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     /// assert!(store.is_empty()?);
@@ -371,8 +382,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::{StorageError, Store};
     /// use oxigraph::model::*;
+    /// use oxigraph::store::{StorageError, Store};
     ///
     /// let store = Store::new()?;
     /// let a = NamedNodeRef::new("http://example.com/a")?;
@@ -399,13 +410,14 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
     /// // insertion
-    /// store.update("INSERT DATA { <http://example.com> <http://example.com> <http://example.com> }")?;
+    /// store
+    ///     .update("INSERT DATA { <http://example.com> <http://example.com> <http://example.com> }")?;
     ///
     /// // we inspect the store contents
     /// let ex = NamedNodeRef::new("http://example.com")?;
@@ -504,15 +516,20 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
     /// // insertion
     /// let file = b"<http://example.com> <http://example.com> <http://example.com> .";
-    /// store.load_graph(file.as_ref(), RdfFormat::NTriples, GraphName::DefaultGraph, None)?;
+    /// store.load_graph(
+    ///     file.as_ref(),
+    ///     RdfFormat::NTriples,
+    ///     GraphName::DefaultGraph,
+    ///     None,
+    /// )?;
     ///
     /// // we inspect the store contents
     /// let ex = NamedNodeRef::new("http://example.com")?;
@@ -547,14 +564,15 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
     /// // insertion
-    /// let file = b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
+    /// let file =
+    ///     b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
     /// store.load_dataset(file.as_ref(), RdfFormat::NQuads, None)?;
     ///
     /// // we inspect the store contents
@@ -587,8 +605,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new("http://example.com")?;
     /// let quad = QuadRef::new(ex, ex, ex, GraphNameRef::DefaultGraph);
@@ -624,8 +642,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new("http://example.com")?;
     /// let quad = QuadRef::new(ex, ex, ex, GraphNameRef::DefaultGraph);
@@ -646,10 +664,12 @@ impl Store {
     /// Dumps the store into a file.
     ///    
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
+    /// use oxigraph::store::Store;
     ///
-    /// let file = "<http://example.com> <http://example.com> <http://example.com> <http://example.com> .\n".as_bytes();
+    /// let file =
+    ///     "<http://example.com> <http://example.com> <http://example.com> <http://example.com> .\n"
+    ///         .as_bytes();
     ///
     /// let store = Store::new()?;
     /// store.load_from_read(RdfFormat::NQuads, file)?;
@@ -678,9 +698,9 @@ impl Store {
     ///    
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let file = "<http://example.com> <http://example.com> <http://example.com> .\n".as_bytes();
     ///
@@ -709,9 +729,9 @@ impl Store {
     ///    
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let file = "<http://example.com> <http://example.com> <http://example.com> .\n".as_bytes();
     ///
@@ -736,10 +756,12 @@ impl Store {
     /// Dumps the store into a file.
     ///    
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
+    /// use oxigraph::store::Store;
     ///
-    /// let file = "<http://example.com> <http://example.com> <http://example.com> <http://example.com> .\n".as_bytes();
+    /// let file =
+    ///     "<http://example.com> <http://example.com> <http://example.com> <http://example.com> .\n"
+    ///         .as_bytes();
     ///
     /// let store = Store::new()?;
     /// store.load_from_read(RdfFormat::NQuads, file)?;
@@ -761,14 +783,17 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNode::new("http://example.com")?;
     /// let store = Store::new()?;
     /// store.insert(QuadRef::new(&ex, &ex, &ex, &ex))?;
     /// store.insert(QuadRef::new(&ex, &ex, &ex, GraphNameRef::DefaultGraph))?;
-    /// assert_eq!(vec![NamedOrBlankNode::from(ex)], store.named_graphs().collect::<Result<Vec<_>,_>>()?);
+    /// assert_eq!(
+    ///     vec![NamedOrBlankNode::from(ex)],
+    ///     store.named_graphs().collect::<Result<Vec<_>, _>>()?
+    /// );
     /// # Result::<_, Box<dyn std::error::Error>>::Ok(())
     /// ```
     pub fn named_graphs(&self) -> GraphNameIter {
@@ -783,8 +808,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::{NamedNode, QuadRef};
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNode::new("http://example.com")?;
     /// let store = Store::new()?;
@@ -806,14 +831,17 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::NamedNodeRef;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new("http://example.com")?;
     /// let store = Store::new()?;
     /// store.insert_named_graph(ex)?;
     ///
-    /// assert_eq!(store.named_graphs().collect::<Result<Vec<_>,_>>()?, vec![ex.into_owned().into()]);
+    /// assert_eq!(
+    ///     store.named_graphs().collect::<Result<Vec<_>, _>>()?,
+    ///     vec![ex.into_owned().into()]
+    /// );
     /// # Result::<_, Box<dyn std::error::Error>>::Ok(())
     /// ```
     pub fn insert_named_graph<'a>(
@@ -828,8 +856,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::{NamedNodeRef, QuadRef};
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new("http://example.com")?;
     /// let quad = QuadRef::new(ex, ex, ex, ex);
@@ -856,8 +884,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::{NamedNodeRef, QuadRef};
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new("http://example.com")?;
     /// let quad = QuadRef::new(ex, ex, ex, ex);
@@ -882,8 +910,8 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new("http://example.com")?;
     /// let store = Store::new()?;
@@ -944,15 +972,18 @@ impl Store {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
     /// // quads file insertion
-    /// let file = b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
+    /// let file =
-    /// store.bulk_loader().load_from_read(RdfFormat::NQuads, file.as_ref())?;
+    ///     b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
+    /// store
+    ///     .bulk_loader()
+    ///     .load_from_read(RdfFormat::NQuads, file.as_ref())?;
     ///
     /// // we inspect the store contents
     /// let ex = NamedNodeRef::new("http://example.com")?;
@@ -995,16 +1026,23 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
     /// use oxigraph::sparql::{EvaluationError, QueryResults};
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     /// store.transaction(|mut transaction| {
-    ///     if let QueryResults::Solutions(solutions) = transaction.query("SELECT ?s WHERE { ?s ?p ?o }")? {
+    ///     if let QueryResults::Solutions(solutions) =
+    ///         transaction.query("SELECT ?s WHERE { ?s ?p ?o }")?
+    ///     {
     ///         for solution in solutions {
     ///             if let Some(Term::NamedNode(s)) = solution?.get("s") {
-    ///                 transaction.insert(QuadRef::new(s, vocab::rdf::TYPE, NamedNodeRef::new_unchecked("http://example.com"), GraphNameRef::DefaultGraph))?;
+    ///                 transaction.insert(QuadRef::new(
+    ///                     s,
+    ///                     vocab::rdf::TYPE,
+    ///                     NamedNodeRef::new_unchecked("http://example.com"),
+    ///                     GraphNameRef::DefaultGraph,
+    ///                 ))?;
     ///             }
     ///         }
     ///     }
@@ -1023,9 +1061,9 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example with a custom function serializing terms to N-Triples:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
     /// use oxigraph::sparql::{EvaluationError, QueryOptions, QueryResults};
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     /// store.transaction(|mut transaction| {
@@ -1033,13 +1071,20 @@ impl<'a> Transaction<'a> {
     ///         "SELECT ?s (<http://www.w3.org/ns/formats/N-Triples>(?s) AS ?nt) WHERE { ?s ?p ?o }",
     ///         QueryOptions::default().with_custom_function(
     ///             NamedNode::new_unchecked("http://www.w3.org/ns/formats/N-Triples"),
-    ///             |args| args.get(0).map(|t| Literal::from(t.to_string()).into())
+    ///             |args| args.get(0).map(|t| Literal::from(t.to_string()).into()),
-    ///         )
+    ///         ),
     ///     )? {
     ///         for solution in solutions {
     ///             let solution = solution?;
-    ///             if let (Some(Term::NamedNode(s)), Some(nt)) = (solution.get("s"), solution.get("nt")) {
+    ///             if let (Some(Term::NamedNode(s)), Some(nt)) =
-    ///                 transaction.insert(QuadRef::new(s, NamedNodeRef::new_unchecked("http://example.com/n-triples-representation"), nt, GraphNameRef::DefaultGraph))?;
+    ///                 (solution.get("s"), solution.get("nt"))
+    ///             {
+    ///                 transaction.insert(QuadRef::new(
+    ///                     s,
+    ///                     NamedNodeRef::new_unchecked("http://example.com/n-triples-representation"),
+    ///                     nt,
+    ///                     GraphNameRef::DefaultGraph,
+    ///                 ))?;
     ///             }
     ///         }
     ///     }
@@ -1060,8 +1105,8 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::{StorageError, Store};
     /// use oxigraph::model::*;
+    /// use oxigraph::store::{StorageError, Store};
     ///
     /// let store = Store::new()?;
     /// let a = NamedNodeRef::new("http://example.com/a")?;
@@ -1123,14 +1168,16 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
     /// use oxigraph::sparql::EvaluationError;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     /// store.transaction(|mut transaction| {
     ///     // insertion
-    ///     transaction.update("INSERT DATA { <http://example.com> <http://example.com> <http://example.com> }")?;
+    ///     transaction.update(
+    ///         "INSERT DATA { <http://example.com> <http://example.com> <http://example.com> }",
+    ///     )?;
     ///
     ///     // we inspect the store contents
     ///     let ex = NamedNodeRef::new_unchecked("http://example.com");
@@ -1210,16 +1257,21 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
     /// // insertion
     /// let file = b"<http://example.com> <http://example.com> <http://example.com> .";
     /// store.transaction(|mut transaction| {
-    ///     transaction.load_graph(file.as_ref(), RdfFormat::NTriples, GraphName::DefaultGraph, None)
+    ///     transaction.load_graph(
+    ///         file.as_ref(),
+    ///         RdfFormat::NTriples,
+    ///         GraphName::DefaultGraph,
+    ///         None,
+    ///     )
     /// })?;
     ///
     /// // we inspect the store contents
@@ -1253,14 +1305,15 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
     /// // insertion
-    /// let file = b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
+    /// let file =
+    ///     b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
     /// store.transaction(|mut transaction| {
     ///     transaction.load_dataset(file.as_ref(), RdfFormat::NQuads, None)
     /// })?;
@@ -1295,16 +1348,14 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new_unchecked("http://example.com");
     /// let quad = QuadRef::new(ex, ex, ex, GraphNameRef::DefaultGraph);
     ///
     /// let store = Store::new()?;
-    /// store.transaction(|mut transaction| {
+    /// store.transaction(|mut transaction| transaction.insert(quad))?;
-    ///     transaction.insert(quad)
-    /// })?;
     /// assert!(store.contains(quad)?);
     /// # Result::<_,oxigraph::store::StorageError>::Ok(())
     /// ```
@@ -1329,8 +1380,8 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new_unchecked("http://example.com");
     /// let quad = QuadRef::new(ex, ex, ex, GraphNameRef::DefaultGraph);
@@ -1371,15 +1422,16 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::NamedNodeRef;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new_unchecked("http://example.com");
     /// let store = Store::new()?;
-    /// store.transaction(|mut transaction| {
+    /// store.transaction(|mut transaction| transaction.insert_named_graph(ex))?;
-    ///     transaction.insert_named_graph(ex)
+    /// assert_eq!(
-    /// })?;
+    ///     store.named_graphs().collect::<Result<Vec<_>, _>>()?,
-    /// assert_eq!(store.named_graphs().collect::<Result<Vec<_>,_>>()?, vec![ex.into_owned().into()]);
+    ///     vec![ex.into_owned().into()]
+    /// );
     /// # Result::<_,oxigraph::store::StorageError>::Ok(())
     /// ```
     pub fn insert_named_graph<'b>(
@@ -1393,8 +1445,8 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::{NamedNodeRef, QuadRef};
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new_unchecked("http://example.com");
     /// let quad = QuadRef::new(ex, ex, ex, ex);
@@ -1420,8 +1472,8 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::{NamedNodeRef, QuadRef};
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new_unchecked("http://example.com");
     /// let quad = QuadRef::new(ex, ex, ex, ex);
@@ -1445,8 +1497,8 @@ impl<'a> Transaction<'a> {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let ex = NamedNodeRef::new_unchecked("http://example.com");
     /// let store = Store::new()?;
@@ -1518,15 +1570,18 @@ impl Iterator for GraphNameIter {
 ///
 /// Usage example with loading a dataset:
 /// ```
-/// use oxigraph::store::Store;
 /// use oxigraph::io::RdfFormat;
 /// use oxigraph::model::*;
+/// use oxigraph::store::Store;
 ///
 /// let store = Store::new()?;
 ///
 /// // quads file insertion
-/// let file = b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
+/// let file =
-/// store.bulk_loader().load_from_read(RdfFormat::NQuads, file.as_ref())?;
+///     b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
+/// store
+///     .bulk_loader()
+///     .load_from_read(RdfFormat::NQuads, file.as_ref())?;
 ///
 /// // we inspect the store contents
 /// let ex = NamedNodeRef::new("http://example.com")?;
@@ -1684,15 +1739,18 @@ impl BulkLoader {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
     /// // insertion
-    /// let file = b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
+    /// let file =
-    /// store.bulk_loader().load_dataset(file.as_ref(), RdfFormat::NQuads, None)?;
+    ///     b"<http://example.com> <http://example.com> <http://example.com> <http://example.com> .";
+    /// store
+    ///     .bulk_loader()
+    ///     .load_dataset(file.as_ref(), RdfFormat::NQuads, None)?;
     ///
     /// // we inspect the store contents
     /// let ex = NamedNodeRef::new("http://example.com")?;
@@ -1745,15 +1803,20 @@ impl BulkLoader {
     ///
     /// Usage example:
     /// ```
-    /// use oxigraph::store::Store;
     /// use oxigraph::io::RdfFormat;
     /// use oxigraph::model::*;
+    /// use oxigraph::store::Store;
     ///
     /// let store = Store::new()?;
     ///
     /// // insertion
     /// let file = b"<http://example.com> <http://example.com> <http://example.com> .";
-    /// store.bulk_loader().load_graph(file.as_ref(), RdfFormat::NTriples, GraphName::DefaultGraph, None)?;
+    /// store.bulk_loader().load_graph(
+    ///     file.as_ref(),
+    ///     RdfFormat::NTriples,
+    ///     GraphName::DefaultGraph,
+    ///     None,
+    /// )?;
     ///
     /// // we inspect the store contents
     /// let ex = NamedNodeRef::new("http://example.com")?;

python/src/io.rs

@@ -199,31 +199,26 @@ impl PyRdfFormat {
     const N3: Self = Self {
         inner: RdfFormat::N3,
     };
-
     /// `N-Quads <https://www.w3.org/TR/n-quads/>`_
     #[classattr]
     const N_QUADS: Self = Self {
         inner: RdfFormat::NQuads,
     };
-
     /// `N-Triples <https://www.w3.org/TR/n-triples/>`_
     #[classattr]
     const N_TRIPLES: Self = Self {
         inner: RdfFormat::NTriples,
     };
-
     /// `RDF/XML <https://www.w3.org/TR/rdf-syntax-grammar/>`_
     #[classattr]
     const RDF_XML: Self = Self {
         inner: RdfFormat::RdfXml,
     };
-
     /// `TriG <https://www.w3.org/TR/trig/>`_
     #[classattr]
     const TRIG: Self = Self {
         inner: RdfFormat::TriG,
     };
-
     /// `Turtle <https://www.w3.org/TR/turtle/>`_
     #[classattr]
     const TURTLE: Self = Self {

python/src/model.rs

@@ -6,8 +6,7 @@ use pyo3::prelude::*;
 use pyo3::types::{PyDict, PyTuple};
 use pyo3::PyTypeInfo;
 use std::collections::hash_map::DefaultHasher;
-use std::hash::Hash;
+use std::hash::{Hash, Hasher};
-use std::hash::Hasher;
 use std::vec::IntoIter;
 
 /// An RDF `node identified by an IRI <https://www.w3.org/TR/rdf11-concepts/#dfn-iri>`_.
@@ -345,7 +344,6 @@ impl PyLiteral {
     /// >>> Literal('example', language='en').language
     /// 'en'
     /// >>> Literal('example').language
-    ///
     #[getter]
     fn language(&self) -> Option<&str> {
         self.inner.language()

python/src/sparql.rs

@@ -515,29 +515,26 @@ pub struct PyQueryResultsFormat {
 
 #[pymethods]
 impl PyQueryResultsFormat {
-    /// `SPARQL Query Results XML Format <https://www.w3.org/TR/rdf-sparql-XMLres/>`_
+    /// `SPARQL Query Results CSV Format <https://www.w3.org/TR/sparql11-results-csv-tsv/>`_
     #[classattr]
-    const XML: Self = Self {
+    const CSV: Self = Self {
-        inner: QueryResultsFormat::Xml,
+        inner: QueryResultsFormat::Csv,
     };
-
     /// `SPARQL Query Results JSON Format <https://www.w3.org/TR/sparql11-results-json/>`_
     #[classattr]
     const JSON: Self = Self {
         inner: QueryResultsFormat::Json,
     };
-
-    /// `SPARQL Query Results CSV Format <https://www.w3.org/TR/sparql11-results-csv-tsv/>`_
-    #[classattr]
-    const CSV: Self = Self {
-        inner: QueryResultsFormat::Csv,
-    };
-
     /// `SPARQL Query Results TSV Format <https://www.w3.org/TR/sparql11-results-csv-tsv/>`_
     #[classattr]
     const TSV: Self = Self {
         inner: QueryResultsFormat::Tsv,
     };
+    /// `SPARQL Query Results XML Format <https://www.w3.org/TR/rdf-sparql-XMLres/>`_
+    #[classattr]
+    const XML: Self = Self {
+        inner: QueryResultsFormat::Xml,
+    };
 
     /// :return: the format canonical IRI according to the `Unique URIs for file formats registry <https://www.w3.org/ns/formats/>`_.
     /// :rtype: str

rustfmt.toml

@@ -1,3 +1,11 @@
+force_explicit_abi = true
+format_code_in_doc_comments = true
+format_macro_matchers = true
+imports_granularity = "Module"
 newline_style = "Unix"
+normalize_comments = true
+normalize_doc_attributes = true
+reorder_impl_items = true
+group_imports = "One"
 use_field_init_shorthand = true
 use_try_shorthand = true

testsuite/tests/sparql.rs

@@ -8,7 +8,7 @@ fn sparql10_w3c_query_syntax_testsuite() -> Result<()> {
     check_testsuite(
         "https://w3c.github.io/rdf-tests/sparql/sparql10/manifest-syntax.ttl",
         &[
-            "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql3/manifest#syn-bad-26", // tokenizer
+            "http://www.w3.org/2001/sw/DataAccess/tests/data-r2/syntax-sparql3/manifest#syn-bad-26", /* tokenizer */
         ],
     )
 }