From 4a1e068f7ec752ef51891f04494f52c26ce7090c Mon Sep 17 00:00:00 2001 From: "C. Morgan Hamill" Date: Tue, 24 Mar 2015 14:46:02 -0400 Subject: Rename `NotmuchEnum` trait to `NotmuchType`. Turns out to be useful outside of just enums. --- src/database.rs | 2 +- src/error.rs | 2 +- src/ffi.rs | 2 +- src/macros.rs | 2 +- src/utils.rs | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) (limited to 'src') diff --git a/src/database.rs b/src/database.rs index 20c2a24..46ca45d 100644 --- a/src/database.rs +++ b/src/database.rs @@ -8,7 +8,7 @@ use libc; use error::Result; use utils::{ - NotmuchEnum, + NotmuchType, ToCString, ToStr, }; diff --git a/src/error.rs b/src/error.rs index 795b4d7..22c1f6e 100644 --- a/src/error.rs +++ b/src/error.rs @@ -5,7 +5,7 @@ use std::{ result, }; -use utils::NotmuchEnum; +use utils::NotmuchType; use ffi; pub type Result = result::Result; diff --git a/src/ffi.rs b/src/ffi.rs index ff8d287..29b2ea7 100644 --- a/src/ffi.rs +++ b/src/ffi.rs @@ -18,7 +18,7 @@ use std::{ }; use utils::{ - NotmuchEnum, + NotmuchType, ToStaticStr, ToStr, }; diff --git a/src/macros.rs b/src/macros.rs index 836be63..8802a71 100644 --- a/src/macros.rs +++ b/src/macros.rs @@ -16,7 +16,7 @@ macro_rules! notmuch_enum { $($variant_alias),* } - impl NotmuchEnum for $name_alias { + impl NotmuchType for $name_alias { type NotmuchT = $name; fn from_notmuch_t(notmuch_t: $name) -> Self { diff --git a/src/utils.rs b/src/utils.rs index dbabe21..ad6cf9b 100644 --- a/src/utils.rs +++ b/src/utils.rs @@ -7,7 +7,7 @@ use std::os::unix::ffi::OsStrExt; use libc; -pub trait NotmuchEnum { +pub trait NotmuchType { type NotmuchT; fn from_notmuch_t(notmuch_t: Self::NotmuchT) -> Self; -- cgit v1.2.1