From 942740b143c8f07f402da8e20338c8f769fe5447 Mon Sep 17 00:00:00 2001
From: Dirk Van Haerenborgh <vhdirk@gmail.com>
Date: Mon, 5 Nov 2018 08:15:27 +0100
Subject: implement 'Ext' traits for all types exept iterators

---
 src/directory.rs | 36 ++++++++++--------------------------
 1 file changed, 10 insertions(+), 26 deletions(-)

(limited to 'src/directory.rs')

diff --git a/src/directory.rs b/src/directory.rs
index 8ddc044..0aa5b80 100644
--- a/src/directory.rs
+++ b/src/directory.rs
@@ -40,41 +40,25 @@ impl<'d> Directory<'d> {
         }
     }
 
-    pub fn new<O: Into<Supercow<'d, Database>>, 
-               P: AsRef<Path>>(owner: O, path: &P) -> Result<Option<Directory<'d>>> {
-        let db = owner.into();
-        let path_str = CString::new(path.as_ref().to_str().unwrap()).unwrap();
-
-        let mut dir = ptr::null_mut();
-        try!(
-            unsafe {
-                ffi::notmuch_database_get_directory(db.handle.ptr, path_str.as_ptr(), &mut dir)
-            }
-            .as_result()
-        );
-
-        if dir.is_null() {
-            Ok(None)
-        } else {
-            Ok(Some(Directory {
-                handle: DirectoryPtr { ptr: dir },
-                marker: Supercow::phantom(db),
-            }))
-        }
+    pub fn child_directories(&self) -> Filenames<Self> {
+        <Self as DirectoryExt>::child_directories(self)
     }
+}
 
-
-    pub fn child_directories(&self) -> Filenames<Self> {
+pub trait DirectoryExt<'d>{
+    fn child_directories<'s, S: Into<Supercow<'s, Directory<'d>>>>(directory: S) -> Filenames<'s, Directory<'d>> {
+        let dir = directory.into();
         Filenames::from_ptr(
-            unsafe { ffi::notmuch_directory_get_child_directories(self.handle.ptr) },
-            self,
+            unsafe { ffi::notmuch_directory_get_child_directories(dir.handle.ptr) },
+            Supercow::phantom(dir),
         )
     }
 }
 
-pub trait DirectoryExt<'d>{
+impl<'d> DirectoryExt<'d> for Directory<'d>{
 
 }
 
+
 unsafe impl<'d> Send for Directory<'d> {}
 unsafe impl<'d> Sync for Directory<'d> {}
-- 
cgit v1.2.1