minor refactorings

pchampin · Jul 19, 2023 · 3ac5559 · 3ac5559
1 parent 4be75ae
commit 3ac5559
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 20 deletions.
diff --git a/isomorphism/src/dataset.rs b/isomorphism/src/dataset.rs
@@ -92,25 +92,13 @@ where
 }
 
 fn prepare_dataset<D: Dataset>(d: &D) -> Result<PreparedDataset<D>, D::Error> {
-    let mut err = None;
-    let ret: Vec<_> = d
+    d
         .quads()
-        .filter_map(|q| {
-            let q = match q {
-                Err(e) => {
-                    err = Some(e);
-                    return None;
-                }
-                Ok(q) => q,
-            };
+        .map(|res| res.map(|q| {
             let (spo, g) = q.to_spog();
-            Some((spo.map(IsoTerm), g.map(IsoTerm)))
-        })
-        .collect();
-    match err {
-        None => Ok(ret),
-        Some(e) => Err(e),
-    }
+            (spo.map(IsoTerm), g.map(IsoTerm))
+        }))
+        .collect()
 }
 
 type PreparedDataset<'a, D> = Vec<Spog<IsoTerm<DTerm<'a, D>>>>;

diff --git a/turtle/src/serializer/_pretty.rs b/turtle/src/serializer/_pretty.rs
@@ -294,9 +294,8 @@ impl<'a, W: Write> Prettifier<'a, W> {
         if rdf::nil == iri {
             return self.write_bytes(b"()");
         }
-        let iri = match Iri::new(iri.as_str()).ok() {
-            None => return write!(self.write, "<{}>", iri.as_str()),
-            Some(iri) => iri,
+        let Some(iri) = Iri::new(iri.as_str()).ok()  else {
+            return write!(self.write, "<{}>", iri.as_str())
         };
         match self
             .config