implement 'Ext' traits for all types exept iterators

1 files changed, 33 insertions, 13 deletions

diff --git a/src/thread.rs b/src/thread.rs
index 36da638..e9ecdad 100644
--- a/src/thread.rs
+++ b/src/thread.rs
@@ -1,5 +1,5 @@
 use std::ops::Drop;
-use supercow::Phantomcow;
+use supercow::{Supercow, Phantomcow};
 
 use ffi;
 use utils::ToStr;
@@ -56,26 +56,17 @@ impl<'o, Owner: ThreadOwner + 'o> Thread<'o, Owner> {
     }
 
     pub fn toplevel_messages(self: &Self) -> Messages<Self> {
-        Messages::from_ptr(
-            unsafe { ffi::notmuch_thread_get_toplevel_messages(self.handle.ptr) },
-            self,
-        )
+        <Self as ThreadExt<'o, Owner>>::toplevel_messages(self)
     }
 
     /// Get a `Messages` iterator for all messages in 'thread' in
     /// oldest-first order.
     pub fn messages(self: &Self) -> Messages<Self> {
-        Messages::from_ptr(
-            unsafe { ffi::notmuch_thread_get_messages(self.handle.ptr) },
-            self,
-        )
+        <Self as ThreadExt<'o, Owner>>::messages(self)
     }
 
     pub fn tags(&self) -> Tags<Self> {
-        Tags::from_ptr(
-            unsafe { ffi::notmuch_thread_get_tags(self.handle.ptr) },
-            self,
-        )
+        <Self as ThreadExt<'o, Owner>>::tags(self)
     }
 
     pub fn subject(self: &Self) -> String {
@@ -107,7 +98,36 @@ impl<'o, Owner: ThreadOwner + 'o> Thread<'o, Owner> {
 }
 
 pub trait ThreadExt<'o, Owner: ThreadOwner + 'o>{
+    fn tags<'s, S: Into<Supercow<'s, Thread<'o, Owner>>>>(thread: S) -> Tags<'s, Thread<'o, Owner>> {
+        let threadref = thread.into();
+        Tags::from_ptr(
+            unsafe { ffi::notmuch_thread_get_tags(threadref.handle.ptr) },
+            Supercow::phantom(threadref)
+        )
+    }
+
+    fn toplevel_messages<'s, S: Into<Supercow<'s, Thread<'o, Owner>>>>(thread: S) -> Messages<'s, Thread<'o, Owner>> {
+        let threadref = thread.into();
+        Messages::from_ptr(
+            unsafe { ffi::notmuch_thread_get_toplevel_messages(threadref.handle.ptr) },
+            Supercow::phantom(threadref)
+        )
+    }
+
+    /// Get a `Messages` iterator for all messages in 'thread' in
+    /// oldest-first order.
+    fn messages<'s, S: Into<Supercow<'s, Thread<'o, Owner>>>>(thread: S) -> Messages<'s, Thread<'o, Owner>> {
+        let threadref = thread.into();
+        Messages::from_ptr(
+            unsafe { ffi::notmuch_thread_get_messages(threadref.handle.ptr) },
+            Supercow::phantom(threadref)
+        )
+    }
+
+}
 
+impl<'o, Owner: ThreadOwner + 'o> ThreadExt<'o, Owner> for Thread<'o, Owner>{
+    
 }
 
 unsafe impl<'o, Owner: ThreadOwner + 'o> Send for Thread<'o, Owner> {}