apply new lints from Rust 1.74

pchampin · Dec 4, 2023 · 719f7eb · 719f7eb
1 parent 1ab31b0
commit 719f7eb
Show file tree

Hide file tree

Showing 6 changed files with 17 additions and 24 deletions.
diff --git a/api/src/graph.rs b/api/src/graph.rs
@@ -579,7 +579,8 @@ mod check_implementability {
             Box::new(
                 self.triples
                     .iter()
-                    .filter_map(|t| t.asserted.then(|| Ok(self.make_triple(t.spo)))),
+                    .filter(|t| t.asserted)
+                    .map(|t| Ok(self.make_triple(t.spo))),
             )
         }
     }
@@ -704,13 +705,11 @@ mod check_implementability_lazy_term {
         type Error = std::convert::Infallible;
 
         fn triples(&self) -> GTripleSource<Self> {
-            Box::new(self.triples.iter().filter_map(|t| {
-                t.asserted.then(|| {
-                    Ok(t.spo.map(|i| MyTerm {
-                        graph: self,
-                        index: i,
-                    }))
-                })
+            Box::new(self.triples.iter().filter(|t| t.asserted).map(|t| {
+                Ok(t.spo.map(|i| MyTerm {
+                    graph: self,
+                    index: i,
+                }))
             }))
         }
     }

diff --git a/api/src/term/matcher.rs b/api/src/term/matcher.rs
@@ -6,7 +6,7 @@
 //! [`GraphNameMatcher`'s implementors lists](GraphNameMatcher#foreign-impls).
 //!
 //! For methods using matchers (with examples), see for example
-//! [`Triple::matched_by`](crate::triple::Triple::matched_by),
+//! [`Triple::matched_by`],
 //! [`Graph::triples_matching`](crate::graph::Graph::triples_matching),
 //! [`MutableGraph::remove_matching`](crate::graph::MutableGraph::remove_matching),
 //! [`MutableGraph::retain_matching`](crate::graph::MutableGraph::retain_matching),

diff --git a/iri/src/resolve.rs b/iri/src/resolve.rs
@@ -3,7 +3,7 @@
 //!
 //! This module is based on <https://docs.rs/oxiri/>.
 //!
-//! NB: compared to [`Iri`](crate::Iri) and [`IriRef`](crate::IriRef),
+//! NB: compared to [`Iri`] and [`IriRef`],
 //! [`BaseIri`] and [`BaseIriRef`] are slower to build,
 //! because they analyse the internal structure of the IRI,
 //! in order to allow for efficient resolution of relative IRIs.

diff --git a/resource/src/loader/_trait.rs b/resource/src/loader/_trait.rs
@@ -37,7 +37,7 @@ pub trait Loader: Sync + Sized {
         let bufread = io::BufReader::new(&data[..]);
         match &ctype[..] {
             "text/turtle" => turtle::TurtleParser {
-                base: Some(iri.as_ref().map_unchecked(|t| t.borrow().to_string())),
+                base: Some(iri.as_ref().map_unchecked(|t| t.to_string())),
             }
             .parse(bufread)
             .collect_triples()
@@ -76,7 +76,7 @@ pub trait Loader: Sync + Sized {
 
             #[cfg(feature = "xml")]
             "application/rdf+xml" => sophia_xml::parser::RdfXmlParser {
-                base: Some(iri.as_ref().map_unchecked(|t| t.borrow().to_string())),
+                base: Some(iri.as_ref().map_unchecked(|t| t.to_string())),
             }
             .parse(bufread)
             .collect_triples()

diff --git a/term/src/_generic.rs b/term/src/_generic.rs
@@ -73,18 +73,15 @@ impl<T: Borrow<str> + Debug> Term for GenericTerm<T> {
 
     fn iri(&self) -> Option<IriRef<sophia_api::MownStr>> {
         if let GenericTerm::Iri(iri) = self {
-            Some(
-                iri.as_ref()
-                    .map_unchecked(|t| MownStr::from_str(t.borrow())),
-            )
+            Some(iri.as_ref().map_unchecked(MownStr::from_str))
         } else {
             None
         }
     }
 
     fn bnode_id(&self) -> Option<BnodeId<sophia_api::MownStr>> {
         if let GenericTerm::BlankNode(id) = self {
-            Some(id.as_ref().map_unchecked(|t| MownStr::from_str(t.borrow())))
+            Some(id.as_ref().map_unchecked(MownStr::from_str))
         } else {
             None
         }
@@ -116,10 +113,7 @@ impl<T: Borrow<str> + Debug> Term for GenericTerm<T> {
 
     fn variable(&self) -> Option<VarName<sophia_api::MownStr>> {
         if let GenericTerm::Variable(name) = self {
-            Some(
-                name.as_ref()
-                    .map_unchecked(|t| MownStr::from_str(t.borrow())),
-            )
+            Some(name.as_ref().map_unchecked(MownStr::from_str))
         } else {
             None
         }

diff --git a/term/src/lib.rs b/term/src/lib.rs
@@ -44,7 +44,7 @@ mod test {
         let mut old_len = stash.len();
 
         let t1a = sophia_api::ns::xsd::integer;
-        let t1b = stash.copy_term(&t1a);
+        let t1b = stash.copy_term(t1a);
         assert!(Term::eq(&t1a, &t1b));
         assert_eq!(old_len + 1, stash.len());
         old_len = stash.len();
@@ -68,13 +68,13 @@ mod test {
         old_len = stash.len();
 
         let t5a = BnodeId::new_unchecked("foo");
-        let t5b = stash.copy_term(&t5a);
+        let t5b = stash.copy_term(t5a);
         assert!(Term::eq(&t5a, &t5b));
         assert_eq!(old_len, stash.len()); // all values where alreadt there
         old_len = stash.len();
 
         let t6a = VarName::new_unchecked("foobar");
-        let t6b = stash.copy_term(&t6a);
+        let t6b = stash.copy_term(t6a);
         assert!(Term::eq(&t6a, &t6b));
         assert_eq!(old_len + 1, stash.len()); // all values where alreadt there
         old_len = stash.len();