diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/config_list.rs | 6 | ||||
| -rw-r--r-- | src/error.rs | 2 | ||||
| -rw-r--r-- | src/index.rs | 7 | ||||
| -rw-r--r-- | src/message.rs | 4 | ||||
| -rw-r--r-- | src/message_properties.rs | 5 | ||||
| -rw-r--r-- | src/messages.rs | 2 | ||||
| -rw-r--r-- | src/utils.rs | 6 |
7 files changed, 9 insertions, 23 deletions
diff --git a/src/config_list.rs b/src/config_list.rs index b819418..2c1a6a4 100644 --- a/src/config_list.rs +++ b/src/config_list.rs @@ -1,12 +1,8 @@ use std::ops::Drop; -use std::ffi::{CStr, CString}; -use supercow::Supercow; use ffi; use Database; -use Filenames; -use FilenamesOwner; -use utils::{ToStr, ScopedSupercow, ScopedPhantomcow}; +use utils::{ToStr, ScopedPhantomcow}; #[derive(Debug)] diff --git a/src/error.rs b/src/error.rs index 824cc39..64d0716 100644 --- a/src/error.rs +++ b/src/error.rs @@ -27,7 +27,7 @@ impl std::error::Error for Error { } } - fn cause(&self) -> Option<&error::Error> { + fn cause(&self) -> Option<&dyn error::Error> { match *self { Error::IoError(ref e) => Some(e), Error::NotmuchError(ref e) => Some(e), diff --git a/src/index.rs b/src/index.rs index f070020..4db6bc7 100644 --- a/src/index.rs +++ b/src/index.rs @@ -1,13 +1,10 @@ use std::ops::Drop; -use supercow::{Supercow, Phantomcow}; -use error::{Error, Result}; +use error::Result; use ffi; use ffi::DecryptionPolicy; use Database; -use Filenames; -use FilenamesOwner; -use utils::{ScopedSupercow, ScopedPhantomcow}; +use utils::ScopedPhantomcow; #[derive(Debug)] diff --git a/src/message.rs b/src/message.rs index 20ad957..55a544f 100644 --- a/src/message.rs +++ b/src/message.rs @@ -1,5 +1,5 @@ -use std::ffi::{CString, CStr}; -use std::path::{Path, PathBuf}; +use std::ffi::CString; +use std::path::PathBuf; use std::cell::RefCell; use std::borrow::Cow; use std::ptr; diff --git a/src/message_properties.rs b/src/message_properties.rs index 19ea960..bd20aa0 100644 --- a/src/message_properties.rs +++ b/src/message_properties.rs @@ -1,11 +1,10 @@ use std::ops::Drop; -use std::ffi::{CStr, CString}; -use supercow::Supercow; +use std::ffi::CStr; use ffi; use Message; use MessageOwner; -use utils::{ScopedSupercow, ScopedPhantomcow}; +use utils::{ScopedPhantomcow}; #[derive(Debug)] diff --git a/src/messages.rs b/src/messages.rs index 60a6f7d..48d30ef 100644 --- a/src/messages.rs +++ b/src/messages.rs @@ -1,5 +1,3 @@ -use std::ops::Drop; - use ffi; use utils::ScopedPhantomcow; use MessageOwner; diff --git a/src/utils.rs b/src/utils.rs index 6030f38..57e4004 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -4,6 +4,7 @@ use std::borrow::Cow; use supercow::{Supercow, DefaultFeatures/*, NonSyncFeatures*/}; use supercow::ext::{BoxedStorage}; + pub trait ToStr { fn to_str<'a>(&self) -> Result<&'a str, str::Utf8Error>; @@ -48,8 +49,3 @@ pub type ScopedPhantomcow<'a, OWNED, BORROWED = OWNED, pub type ScopedSupercow<'a, OWNED, BORROWED = OWNED, SHARED = Box<dyn DefaultFeatures<'a> + 'a>> = Supercow<'a, OWNED, BORROWED, SHARED, BoxedStorage>; - - - - - |
