mirror of
https://github.com/soywod/himalaya.git
synced 2024-07-20 07:01:12 +00:00
fix errors and warns notmuch cargo feature
This commit is contained in:
parent
5f13489e83
commit
21e5658e43
10
src/main.rs
10
src/main.rs
|
@ -7,7 +7,7 @@ use himalaya::{
|
||||||
compl::{compl_arg, compl_handler},
|
compl::{compl_arg, compl_handler},
|
||||||
config::{
|
config::{
|
||||||
account_args, config_args, AccountConfig, BackendConfig, DeserializedConfig,
|
account_args, config_args, AccountConfig, BackendConfig, DeserializedConfig,
|
||||||
MaildirBackendConfig, DEFAULT_INBOX_FOLDER,
|
DEFAULT_INBOX_FOLDER,
|
||||||
},
|
},
|
||||||
mbox::{mbox_arg, mbox_handler},
|
mbox::{mbox_arg, mbox_handler},
|
||||||
msg::{flag_arg, flag_handler, msg_arg, msg_handler, tpl_arg, tpl_handler},
|
msg::{flag_arg, flag_handler, msg_arg, msg_handler, tpl_arg, tpl_handler},
|
||||||
|
@ -16,7 +16,7 @@ use himalaya::{
|
||||||
};
|
};
|
||||||
|
|
||||||
#[cfg(feature = "notmuch")]
|
#[cfg(feature = "notmuch")]
|
||||||
use himalaya::backends::NotmuchBackend;
|
use himalaya::{backends::NotmuchBackend, config::MaildirBackendConfig};
|
||||||
|
|
||||||
fn create_app<'a>() -> clap::App<'a, 'a> {
|
fn create_app<'a>() -> clap::App<'a, 'a> {
|
||||||
clap::App::new(env!("CARGO_PKG_NAME"))
|
clap::App::new(env!("CARGO_PKG_NAME"))
|
||||||
|
@ -51,7 +51,8 @@ fn main() -> Result<()> {
|
||||||
|
|
||||||
let mut imap;
|
let mut imap;
|
||||||
let mut maildir;
|
let mut maildir;
|
||||||
let maildir_config;
|
#[cfg(feature = "notmuch")]
|
||||||
|
let maildir_config: MaildirBackendConfig;
|
||||||
#[cfg(feature = "notmuch")]
|
#[cfg(feature = "notmuch")]
|
||||||
let mut notmuch;
|
let mut notmuch;
|
||||||
let backend: Box<&mut dyn Backend> = match backend_config {
|
let backend: Box<&mut dyn Backend> = match backend_config {
|
||||||
|
@ -100,7 +101,8 @@ fn main() -> Result<()> {
|
||||||
let mut printer = StdoutPrinter::try_from(m.value_of("output"))?;
|
let mut printer = StdoutPrinter::try_from(m.value_of("output"))?;
|
||||||
let mut imap;
|
let mut imap;
|
||||||
let mut maildir;
|
let mut maildir;
|
||||||
let maildir_config;
|
#[cfg(feature = "notmuch")]
|
||||||
|
let maildir_config: MaildirBackendConfig;
|
||||||
#[cfg(feature = "notmuch")]
|
#[cfg(feature = "notmuch")]
|
||||||
let mut notmuch;
|
let mut notmuch;
|
||||||
let backend: Box<&mut dyn Backend> = match backend_config {
|
let backend: Box<&mut dyn Backend> = match backend_config {
|
||||||
|
|
|
@ -1,10 +1,13 @@
|
||||||
|
#[cfg(feature = "notmuch")]
|
||||||
use std::{collections::HashMap, env, fs, iter::FromIterator};
|
use std::{collections::HashMap, env, fs, iter::FromIterator};
|
||||||
|
|
||||||
|
#[cfg(feature = "notmuch")]
|
||||||
use himalaya::{
|
use himalaya::{
|
||||||
backends::{Backend, MaildirBackend, NotmuchBackend, NotmuchEnvelopes},
|
backends::{Backend, MaildirBackend, NotmuchBackend, NotmuchEnvelopes},
|
||||||
config::{AccountConfig, MaildirBackendConfig, NotmuchBackendConfig},
|
config::{AccountConfig, MaildirBackendConfig, NotmuchBackendConfig},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
#[cfg(feature = "notmuch")]
|
||||||
#[test]
|
#[test]
|
||||||
fn test_notmuch_backend() {
|
fn test_notmuch_backend() {
|
||||||
// set up maildir folders and notmuch database
|
// set up maildir folders and notmuch database
|
||||||
|
|
Loading…
Reference in a new issue