improve lifetime management with supercow

1 files changed, 23 insertions, 39 deletions

diff --git a/src/directory.rs b/src/directory.rs
index ce219f5..9bdae2d 100644
--- a/src/directory.rs
+++ b/src/directory.rs
@@ -1,64 +1,48 @@
 use std::ops::Drop;
-use std::marker::PhantomData;
-
-use utils::FromPtr;
+use supercow::Phantomcow;
 
+use ffi;
 use Database;
 use Filenames;
-use filenames::{FilenamesPtr, FilenamesOwner};
-
-use ffi;
+use FilenamesOwner;
 
 #[derive(Debug)]
 pub(crate) struct DirectoryPtr {
-    pub ptr: *mut ffi::notmuch_directory_t
+    pub ptr: *mut ffi::notmuch_directory_t,
 }
 
 impl Drop for DirectoryPtr {
     fn drop(&mut self) {
-        unsafe {
-            ffi::notmuch_directory_destroy(self.ptr)
-        };
-    }
-}
-
-impl DirectoryPtr {
-    pub fn child_directories(self: &Self) -> FilenamesPtr{
-        FilenamesPtr{
-            ptr: unsafe {
-                ffi::notmuch_directory_get_child_directories(self.ptr)
-            }
-        }
+        unsafe { ffi::notmuch_directory_destroy(self.ptr) };
     }
 }
 
-
-
 #[derive(Debug)]
-pub struct Directory<'d>{
+pub struct Directory<'d> {
     handle: DirectoryPtr,
-    phantom: PhantomData<&'d Database>,
+    marker: Phantomcow<'d, Database>,
 }
 
-impl<'d> FilenamesOwner for Directory<'d>{}
+impl<'d> FilenamesOwner for Directory<'d> {}
 
-impl<'d> Directory<'d>{
-    pub fn child_directories(self: &'d Self) -> Filenames<Self>{
-        Filenames{
-            handle: self.handle.child_directories(),
-            phantom: PhantomData
+impl<'d> Directory<'d> {
+    pub fn from_ptr<O: Into<Phantomcow<'d, Database>>>(
+        ptr: *mut ffi::notmuch_directory_t,
+        owner: O,
+    ) -> Directory<'d> {
+        Directory {
+            handle: DirectoryPtr { ptr },
+            marker: owner.into(),
         }
     }
-}
 
-impl<'d> FromPtr<*mut ffi::notmuch_directory_t> for Directory<'d> {
-    fn from_ptr(ptr: *mut ffi::notmuch_directory_t) -> Directory<'d> {
-        Directory{
-            handle: DirectoryPtr{ptr},
-            phantom: PhantomData
-        }
+    pub fn child_directories(&self) -> Filenames<Self> {
+        Filenames::from_ptr(
+            unsafe { ffi::notmuch_directory_get_child_directories(self.handle.ptr) },
+            self,
+        )
     }
 }
 
-unsafe impl<'d> Send for Directory<'d>{}
-unsafe impl<'d> Sync for Directory<'d>{}
+unsafe impl<'d> Send for Directory<'d> {}
+unsafe impl<'d> Sync for Directory<'d> {}