From f021813ed443b4ef7224d1934881abecf53977a7 Mon Sep 17 00:00:00 2001 From: Dirk Van Haerenborgh Date: Thu, 19 Apr 2018 10:21:14 +0200 Subject: cleanup & export db revision uuid --- src/directory.rs | 16 ++++++---------- 1 file changed, 6 insertions(+), 10 deletions(-) (limited to 'src/directory.rs') diff --git a/src/directory.rs b/src/directory.rs index d3097f2..b0bb415 100644 --- a/src/directory.rs +++ b/src/directory.rs @@ -1,11 +1,7 @@ -use std::{ - ops, - marker, -}; +use std::ops::Drop; +use std::marker::PhantomData; -use utils::{ - NewFromPtr, -}; +use utils::NewFromPtr; use Database; use Filenames; @@ -15,7 +11,7 @@ use ffi; #[derive(Debug)] pub struct Directory<'d>( *mut ffi::notmuch_directory_t, - marker::PhantomData<&'d Database>, + PhantomData<&'d Database>, ); impl<'d> Directory<'d>{ @@ -28,11 +24,11 @@ impl<'d> Directory<'d>{ impl<'d> NewFromPtr<*mut ffi::notmuch_directory_t> for Directory<'d> { fn new(ptr: *mut ffi::notmuch_directory_t) -> Directory<'d> { - Directory(ptr, marker::PhantomData) + Directory(ptr, PhantomData) } } -impl<'d> ops::Drop for Directory<'d> { +impl<'d> Drop for Directory<'d> { fn drop(self: &mut Self) { unsafe { ffi::notmuch_directory_destroy(self.0) -- cgit v1.2.1