some tries towards better lifetimes

1 files changed, 26 insertions, 18 deletions

diff --git a/src/directory.rs b/src/directory.rs
index b0bb415..4bf0a7a 100644
--- a/src/directory.rs
+++ b/src/directory.rs
@@ -1,7 +1,7 @@
 use std::ops::Drop;
 use std::marker::PhantomData;
 
-use utils::NewFromPtr;
+use utils::FromPtr;
 
 use Database;
 use Filenames;
@@ -9,30 +9,38 @@ use Filenames;
 use ffi;
 
 #[derive(Debug)]
-pub struct Directory<'d>(
-    *mut ffi::notmuch_directory_t,
-    PhantomData<&'d Database>,
-);
+pub(crate) struct DirectoryPtr {
+    pub ptr: *mut ffi::notmuch_directory_t
+}
 
-impl<'d> Directory<'d>{
-    pub fn child_directories(self: &'d Self) -> Filenames<'d>{
-        Filenames::new(unsafe {
-            ffi::notmuch_directory_get_child_directories(self.0)
-        })
+impl Drop for DirectoryPtr {
+    fn drop(&mut self) {
+        unsafe {
+            ffi::notmuch_directory_destroy(self.ptr)
+        };
     }
 }
 
-impl<'d> NewFromPtr<*mut ffi::notmuch_directory_t> for Directory<'d> {
-    fn new(ptr: *mut ffi::notmuch_directory_t) -> Directory<'d> {
-        Directory(ptr, PhantomData)
+#[derive(Debug)]
+pub struct Directory<'d>{
+    handle: DirectoryPtr,
+    phantom: PhantomData<&'d Database>,
+}
+
+impl<'d> Directory<'d>{
+    pub fn child_directories(self: &'d Self) -> Filenames<'d>{
+        Filenames::from_ptr(unsafe {
+            ffi::notmuch_directory_get_child_directories(self.handle.ptr)
+        })
     }
 }
 
-impl<'d> Drop for Directory<'d> {
-    fn drop(self: &mut Self) {
-        unsafe {
-            ffi::notmuch_directory_destroy(self.0)
-        };
+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
+        }
     }
 }