From 1be3e0ac103f306ad3dbd059f1452ffa31589b47 Mon Sep 17 00:00:00 2001
From: Jesse Wright <63333554+jeswr@users.noreply.github.com>
Date: Tue, 20 Feb 2024 11:36:34 +0000
Subject: [PATCH] chore: fix triple casting

---
 lib/oxrdf/src/triple.rs | 34 ++++++++++++++++++++++++++++++----
 1 file changed, 30 insertions(+), 4 deletions(-)

diff --git a/lib/oxrdf/src/triple.rs b/lib/oxrdf/src/triple.rs
index a4699103..32c22f28 100644
--- a/lib/oxrdf/src/triple.rs
+++ b/lib/oxrdf/src/triple.rs
@@ -754,11 +754,14 @@ impl Triple {
     /// Builds an RDF [triple](https://www.w3.org/TR/rdf11-concepts/#dfn-rdf-triple).
     #[inline]
     pub fn new_maybe(
-        subject: impl Into<Option<Subject>>,
-        predicate: impl Into<Option<NamedNode>>,
-        object: impl Into<Option<Term>>,
+        subject: impl Into<Term>,
+        predicate: impl Into<Term>,
+        object: impl Into<Term>,
     ) -> Option<Self> {
-        match (subject.into(), predicate.into(), object.into()) {
+        match (
+            Into::<Option<Subject>>::into(Into::<Term>::into(subject)),
+            Into::<Option<NamedNode>>::into(Into::<Term>::into(predicate)), 
+            Into::<Option<Term>>::into(Into::<Term>::into(object))) {
             (Some(subject), Some(predicate), Some(object)) => Some(Self {
                 subject,
                 predicate,
@@ -1298,26 +1301,49 @@ mod tests {
 
     #[test]
     fn constructing_triple() {
+        use super::*;
+
         let optional_triple = Triple::new_maybe(
             Term::NamedNode(NamedNode::new("http://example.org/test").unwrap()), 
             Term::NamedNode(NamedNode::new("http://example.org/test").unwrap()),
             Term::NamedNode(NamedNode::new("http://example.org/test").unwrap())
         );
 
+        let optional_triple_2 = Triple::new_maybe(
+            NamedNode::new("http://example.org/test").unwrap(), 
+            NamedNode::new("http://example.org/test").unwrap(),
+            NamedNode::new("http://example.org/test").unwrap()
+        );
+
         let bad_triple = Triple::new_maybe(
             Term::BlankNode(BlankNode::new("abc123").unwrap()), 
             Term::NamedNode(NamedNode::new("http://example.org/test").unwrap()),
             Term::NamedNode(NamedNode::new("http://example.org/test").unwrap())
         );
 
+        let bad_triple_2 = Triple::new_maybe(
+            BlankNode::new("abc123").unwrap(), 
+            NamedNode::new("http://example.org/test").unwrap(),
+            NamedNode::new("http://example.org/test").unwrap()
+        );
+
         let triple: Triple = Triple::new(
             Subject::NamedNode(NamedNode::new("http://example.org/test").unwrap()), 
             NamedNode::new("http://example.org/test").unwrap(),
             Term::NamedNode(NamedNode::new("http://example.org/test").unwrap())
         );
 
+        let triple_2: Triple = Triple::new(
+            NamedNode::new("http://example.org/test").unwrap(), 
+            NamedNode::new("http://example.org/test").unwrap(),
+            NamedNode::new("http://example.org/test").unwrap()
+        );
+
         assert_eq!(optional_triple, Some(triple));
+        assert_eq!(optional_triple, Some(triple_2.clone()));
+        assert_eq!(optional_triple_2, Some(triple_2));
         assert_eq!(bad_triple, None);
+        assert_eq!(bad_triple_2, None);
     }
 
     #[test]