revert explicit imports

api/src/dataset.rs

@@ -7,6 +7,8 @@
 //! for different kinds of datasets,
 //! as well as a few implementations for them.
 
+use std::error::Error;
+
 use crate::graph::adapter::{DatasetGraph, PartialUnionGraph, UnionGraph};
 use crate::quad::{iter_spog, Quad};
 use crate::source::{IntoSource, QuadSource, StreamResult};
@@ -56,7 +58,7 @@ pub trait Dataset {
     where
         Self: 'x;
     /// The error type that this dataset may raise.
-    type Error: std::error::Error + Send + Sync + 'static;
+    type Error: Error + Send + Sync + 'static;
 
     /// An iterator visiting all quads of this dataset in arbitrary order.
     ///
@@ -346,7 +348,7 @@ pub type MdResult<D, T> = std::result::Result<T, <D as MutableDataset>::Mutation
 /// see also [`SetDataset`].
 pub trait MutableDataset: Dataset {
     /// The error type that this dataset may raise during mutations.
-    type MutationError: std::error::Error + Send + Sync + 'static;
+    type MutationError: Error + Send + Sync + 'static;
 
     /// Insert the given quad in this dataset.
     ///

api/src/graph.rs

@@ -5,6 +5,8 @@
 //! for different kinds of graph,
 //! as well as a few implementations for them.
 
+use std::error::Error;
+
 use crate::dataset::adapter::GraphAsDataset;
 use crate::source::{IntoSource, StreamResult, TripleSource};
 use crate::term::{matcher::TermMatcher, SimpleTerm, Term};
@@ -53,7 +55,7 @@ pub trait Graph {
     where
         Self: 'x;
     /// The error type that this graph may raise.
-    type Error: std::error::Error + Send + Sync + 'static;
+    type Error: Error + Send + Sync + 'static;
 
     /// An iterator visiting all triples of this graph in arbitrary order.
     ///
@@ -305,7 +307,7 @@ pub type MgResult<G, T> = std::result::Result<T, <G as MutableGraph>::MutationEr
 /// see also [`SetGraph`].
 pub trait MutableGraph: Graph {
     /// The error type that this graph may raise during mutations.
-    type MutationError: std::error::Error + Send + Sync + 'static;
+    type MutationError: Error + Send + Sync + 'static;
 
     /// Insert in this graph a triple made of the the given terms.
     ///

api/src/source.rs

@@ -68,7 +68,7 @@ pub use _stream_error::*;
 mod _triple;
 pub use _triple::*;
 
-use std::convert::Infallible;
+use std::{convert::Infallible, error::Error};
 
 /// A source produces [items](Source::Item), and may also fail in the process.
 ///
@@ -85,7 +85,7 @@ pub trait Source {
     /// The type of items this source yields.
     type Item<'x>;
     /// The type of errors produced by this source.
-    type Error: std::error::Error + Send + Sync + 'static;
+    type Error: Error + Send + Sync + 'static;
 
     /// Call f for some item(s) (possibly zero) from this source, if any.
     ///
@@ -94,7 +94,7 @@ pub trait Source {
     /// Return an error if either the source or `f` errs.
     fn try_for_some_item<E, F>(&mut self, f: F) -> StreamResult<bool, Self::Error, E>
     where
-        E: std::error::Error + Send + Sync + 'static,
+        E: Error + Send + Sync + 'static,
         F: FnMut(Self::Item<'_>) -> Result<(), E>;
 
     /// Call f for all items from this source.
@@ -104,7 +104,7 @@ pub trait Source {
     fn try_for_each_item<F, E>(&mut self, mut f: F) -> StreamResult<(), Self::Error, E>
     where
         F: FnMut(Self::Item<'_>) -> Result<(), E>,
-        E: std::error::Error + Send + Sync + 'static,
+        E: Error + Send + Sync + 'static,
     {
         while self.try_for_some_item(&mut f)? {}
         Ok(())
@@ -198,14 +198,14 @@ pub trait Source {
 impl<'a, I, T, E> Source for I
 where
     I: Iterator<Item = Result<T, E>> + 'a,
-    E: std::error::Error + Send + Sync + 'static,
+    E: Error + Send + Sync + 'static,
 {
     type Item<'x> = T;
     type Error = E;
 
     fn try_for_some_item<E2, F>(&mut self, mut f: F) -> StreamResult<bool, Self::Error, E2>
     where
-        E2: std::error::Error + Send + Sync + 'static,
+        E2: Error + Send + Sync + 'static,
         F: FnMut(Self::Item<'_>) -> Result<(), E2>,
     {
         match self.next() {

api/src/sparql.rs

@@ -31,6 +31,7 @@ use crate::source::TripleSource;
 use crate::term::Term;
 
 use std::borrow::Borrow;
+use std::error::Error;
 
 /// A dataset that can be queried with SPARQL.
 pub trait SparqlDataset {
@@ -41,7 +42,7 @@ pub trait SparqlDataset {
     /// The type of triples that GRAPH and DESCRIBE queries will return.
     type TriplesResult: TripleSource;
     /// The type of errors that processing SPARQL queries may raise.
-    type SparqlError: std::error::Error + Send + Sync + 'static;
+    type SparqlError: Error + Send + Sync + 'static;
     /// The type representing pre-processed queries.
     ///
     /// See [`prepare_query`](#tymethod.prepare_query) for more detail.
@@ -81,7 +82,7 @@ pub trait SparqlDataset {
 /// [`prepare_query`](SparqlDataset::prepare_query) method.
 pub trait Query: Sized {
     /// The error type that might be raised when parsing a query.
-    type Error: std::error::Error + Send + Sync + 'static;
+    type Error: Error + Send + Sync + 'static;
     /// Parse the given text into a [`Query`].
     fn parse(query_source: &str) -> Result<Self, Self::Error>;
 }

inmem/src/index.rs

@@ -3,6 +3,7 @@ use sophia_api::term::{FromTerm, GraphName, SimpleTerm, Term};
 
 use std::collections::hash_map::Entry;
 use std::collections::HashMap;
+use std::error::Error;
 
 /// Abstraction of the short numeric indices representing [terms](Term) in a [`TermIndex`].
 pub trait Index: Copy + std::fmt::Debug + Ord {
@@ -64,7 +65,7 @@ pub trait TermIndex {
     /// The type of [indices](Index) used by this [`TermIndex`]
     type Index: Index;
     /// The type of error that this [`TermIndex`] may raise
-    type Error: std::error::Error + Send + Sync + 'static;
+    type Error: Error + Send + Sync + 'static;
 
     /// Get the index corresponding to term `t`, if it exists.
     ///

isomorphism/src/test.rs

@@ -1,3 +1,5 @@
+use std::error::Error;
+
 use super::*;
 use sophia_api::ns::xsd;
 use sophia_api::term::{assert_consistent_term_impl, BnodeId, IriRef, Term, TermKind};
@@ -11,7 +13,7 @@ const LIT_ALICE: MyTerm = MyTerm::String("alice");
 const LIT_BOB: MyTerm = MyTerm::String("bob");
 
 #[test]
-fn no_bnode() -> Result<(), Box<dyn std::error::Error>> {
+fn no_bnode() -> Result<(), Box<dyn Error>> {
     let make_dataset = |i1: &'static str, i2: &'static str| -> Vec<([MyTerm; 3], Option<MyTerm>)> {
         let i1 = MyTerm::Iri(i1);
         let i2 = MyTerm::Iri(i2);
@@ -46,7 +48,7 @@ fn no_bnode() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn simple() -> Result<(), Box<dyn std::error::Error>> {
+fn simple() -> Result<(), Box<dyn Error>> {
     let make_dataset = |b1: &'static str, b2: &'static str| -> Vec<([MyTerm; 3], Option<MyTerm>)> {
         let b1 = MyTerm::Bnode(b1);
         let b2 = MyTerm::Bnode(b2);
@@ -82,7 +84,7 @@ fn simple() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn no_bnode_quoted_triple() -> Result<(), Box<dyn std::error::Error>> {
+fn no_bnode_quoted_triple() -> Result<(), Box<dyn Error>> {
     const A: MyTerm = MyTerm::Iri("#a");
     const B: MyTerm = MyTerm::Iri("#b");
     const C: MyTerm = MyTerm::Iri("#c");
@@ -114,7 +116,7 @@ fn no_bnode_quoted_triple() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn quoted_triple() -> Result<(), Box<dyn std::error::Error>> {
+fn quoted_triple() -> Result<(), Box<dyn Error>> {
     const A: MyTerm = MyTerm::Bnode("a");
     const B: MyTerm = MyTerm::Bnode("b");
     const C: MyTerm = MyTerm::Bnode("c");
@@ -158,7 +160,7 @@ fn make_chain(ids: &'static str) -> Vec<[MyTerm; 4]> {
 }
 
 #[test]
-fn chain() -> Result<(), Box<dyn std::error::Error>> {
+fn chain() -> Result<(), Box<dyn Error>> {
     let d1 = make_chain("abcdefghij");
     assert!(isomorphic_datasets(&d1, &d1)?);
     let d2 = make_chain("EDCBAJIHGF");
@@ -171,7 +173,7 @@ fn chain() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn cycle2() -> Result<(), Box<dyn std::error::Error>> {
+fn cycle2() -> Result<(), Box<dyn Error>> {
     let d1 = make_chain("aba");
     assert!(isomorphic_datasets(&d1, &d1)?);
     let d2 = make_chain("BAB");
@@ -181,7 +183,7 @@ fn cycle2() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn cycle_long() -> Result<(), Box<dyn std::error::Error>> {
+fn cycle_long() -> Result<(), Box<dyn Error>> {
     let d1 = make_chain("abcdefghia");
     assert!(isomorphic_datasets(&d1, &d1)?);
     let d2 = make_chain("EBCDAIGHFE");
@@ -195,7 +197,7 @@ fn cycle_long() -> Result<(), Box<dyn std::error::Error>> {
 
 #[test]
 #[ignore]
-fn cycle_pathological() -> Result<(), Box<dyn std::error::Error>> {
+fn cycle_pathological() -> Result<(), Box<dyn Error>> {
     // This case is tricky (and does not work with the current implementation).
     // Both graphs contain the same number of (blank nodes) and the same number of arcs.
     // All blank nodes are locally undistinguishable from each other:
@@ -211,7 +213,7 @@ fn cycle_pathological() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn cycle_almost_pathological() -> Result<(), Box<dyn std::error::Error>> {
+fn cycle_almost_pathological() -> Result<(), Box<dyn Error>> {
     // This is uses the same graphs as above (cycle_pathological),
     // but *one* of the blank nodes is distinguished by an additional property,
     // which breaks symmetry and allow the algorithm to give the correct answer.
@@ -247,7 +249,7 @@ fn make_clique(ids: &'static str) -> Vec<[MyTerm; 4]> {
 }
 
 #[test]
-fn clique() -> Result<(), Box<dyn std::error::Error>> {
+fn clique() -> Result<(), Box<dyn Error>> {
     let d1 = make_clique("abcde");
     assert!(isomorphic_datasets(&d1, &d1)?);
 
@@ -278,7 +280,7 @@ fn make_tree(ids: &'static str) -> Vec<[MyTerm; 4]> {
 }
 
 #[test]
-fn tree() -> Result<(), Box<dyn std::error::Error>> {
+fn tree() -> Result<(), Box<dyn Error>> {
     let d1 = make_tree("abcdefghij");
     assert!(isomorphic_datasets(&d1, &d1)?);
 
@@ -292,7 +294,7 @@ fn tree() -> Result<(), Box<dyn std::error::Error>> {
 }
 
 #[test]
-fn predicate_and_gname() -> Result<(), Box<dyn std::error::Error>> {
+fn predicate_and_gname() -> Result<(), Box<dyn Error>> {
     let rel = MyTerm::Iri("tag:rel");
     let b1 = MyTerm::Bnode("b1");
     let b2 = MyTerm::Bnode("b2");

turtle/src/serializer/trig.rs

@@ -107,6 +107,8 @@ impl Stringifier for TrigSerializer<Vec<u8>> {
 
 #[cfg(test)]
 pub(crate) mod test {
+    use std::error::Error;
+
     use super::*;
     use sophia_api::term::SimpleTerm;
 
@@ -177,7 +179,7 @@ pub(crate) mod test {
     ];
 
     #[test]
-    fn roundtrip_not_pretty() -> Result<(), Box<dyn std::error::Error>> {
+    fn roundtrip_not_pretty() -> Result<(), Box<dyn Error>> {
         for ttl in TESTS {
             println!("==========\n{}\n----------", ttl);
             let g1: Vec<Spog<SimpleTerm>> = crate::parser::trig::parse_str(ttl).collect_quads()?;
@@ -195,7 +197,7 @@ pub(crate) mod test {
     }
 
     #[test]
-    fn roundtrip_pretty() -> Result<(), Box<dyn std::error::Error>> {
+    fn roundtrip_pretty() -> Result<(), Box<dyn Error>> {
         for ttl in TESTS {
             println!("==========\n{}\n----------", ttl);
             let g1: Vec<Spog<SimpleTerm>> = crate::parser::trig::parse_str(ttl).collect_quads()?;

turtle/src/serializer/turtle.rs

@@ -209,6 +209,8 @@ impl Stringifier for TurtleSerializer<Vec<u8>> {
 
 #[cfg(test)]
 pub(crate) mod test {
+    use std::error::Error;
+
     use super::*;
     use sophia_api::graph::Graph;
     use sophia_isomorphism::isomorphic_graphs;
@@ -245,7 +247,7 @@ pub(crate) mod test {
     ];
 
     #[test]
-    fn roundtrip_not_pretty() -> Result<(), Box<dyn std::error::Error>> {
+    fn roundtrip_not_pretty() -> Result<(), Box<dyn Error>> {
         for ttl in TESTS {
             println!("==========\n{}\n----------", ttl);
             let g1: Vec<[SimpleTerm; 3]> =
@@ -265,7 +267,7 @@ pub(crate) mod test {
     }
 
     #[test]
-    fn roundtrip_pretty() -> Result<(), Box<dyn std::error::Error>> {
+    fn roundtrip_pretty() -> Result<(), Box<dyn Error>> {
         for ttl in TESTS {
             println!("==========\n{}\n----------", ttl);
             let g1: Vec<[SimpleTerm; 3]> =