diff options
author | Matthias Beyer <mail@beyermatthias.de> | 2020-07-07 18:01:28 +0200 |
---|---|---|
committer | Matthias Beyer <mail@beyermatthias.de> | 2020-07-07 18:01:28 +0200 |
commit | db706d56ff07827860ea72005b7d72c9cd592194 (patch) | |
tree | 20fc26d2557ed1f503b2c06fd008b57654279701 /src | |
parent | 562d9f32b77f71316d5ce94d461cc2297ad6237e (diff) |
Cleanup imports
Signed-off-by: Matthias Beyer <mail@beyermatthias.de>
Diffstat (limited to 'src')
-rw-r--r-- | src/mailstore.rs | 2 | ||||
-rw-r--r-- | src/main.rs | 4 | ||||
-rw-r--r-- | src/main_view.rs | 26 | ||||
-rw-r--r-- | src/sidebar.rs | 1 | ||||
-rw-r--r-- | src/util.rs | 21 |
5 files changed, 15 insertions, 39 deletions
diff --git a/src/mailstore.rs b/src/mailstore.rs index 74e4757..0d221ed 100644 --- a/src/mailstore.rs +++ b/src/mailstore.rs @@ -1,7 +1,5 @@ use std::path::PathBuf; -use std::path::Path; use std::iter::FromIterator; -use anyhow::Error; use anyhow::Result; use maildir::Maildir; use maildir::MailEntry; diff --git a/src/main.rs b/src/main.rs index 174fd71..2eb311f 100644 --- a/src/main.rs +++ b/src/main.rs @@ -4,15 +4,11 @@ use std::path::PathBuf; use anyhow::Result; use cursive::CursiveExt; -use mailparse::MailHeaderMap; -use mailparse::ParsedMail; -use env_logger::Env; mod mailstore; mod sidebar; mod main_view; mod loader; -mod util; fn main() -> Result<()> { cursive::logger::init(); diff --git a/src/main_view.rs b/src/main_view.rs index 6505e94..b03b4eb 100644 --- a/src/main_view.rs +++ b/src/main_view.rs @@ -1,16 +1,20 @@ use std::path::PathBuf; -use std::ffi::OsStr; -use std::result::Result as RResult; use anyhow::Result; -use cursive::{View, Printer, XY, direction::Direction, view::Selector, Rect, event::Event, event::EventResult}; +use cursive::Printer; +use cursive::Rect; +use cursive::View; +use cursive::XY; +use cursive::direction::Direction; +use cursive::event::Event; +use cursive::event::EventResult; use cursive::view::Nameable; -use cursive::Cursive; +use cursive::view::Selector; +use cursive::views::ListView; use cursive::views::NamedView; +use cursive::views::TextView; use mailparse::MailHeaderMap; -use mailparse::ParsedMail; -use async_std::sync::channel; -use crate::mailstore::{ MailStore, Mail }; +use crate::mailstore::MailStore; use crate::loader::Loader; use crate::loader::PostProcessor; @@ -87,7 +91,7 @@ pub struct MaildirLoader(PathBuf); impl Loader for MaildirLoader { type Output = Vec<String>; type Error = String; - type PostProcessedOutput = cursive::views::ListView; + type PostProcessedOutput = ListView; type PostProcessor = MaildirLoaderPostProcessor; fn load(self) -> Result<Self::Output, Self::Error> { @@ -118,12 +122,12 @@ impl Loader for MaildirLoader { pub struct MaildirLoaderPostProcessor; impl PostProcessor<Vec<String>> for MaildirLoaderPostProcessor { - type Output = cursive::views::ListView; + type Output = ListView; fn postprocess(&self, list: Vec<String>) -> Self::Output{ list.into_iter() - .fold(cursive::views::ListView::new(), |view, elem| { - view.child("", cursive::views::TextView::new(elem)) + .fold(ListView::new(), |view, elem| { + view.child("", TextView::new(elem)) }) } } diff --git a/src/sidebar.rs b/src/sidebar.rs index 48b7a6a..d08418a 100644 --- a/src/sidebar.rs +++ b/src/sidebar.rs @@ -9,7 +9,6 @@ use cursive::views::NamedView; use cursive_tree_view::TreeView; use crate::main_view::MainView; -use crate::main_view::MaildirLoader; use crate::loader::PostProcessor; use crate::loader::Loader; diff --git a/src/util.rs b/src/util.rs deleted file mode 100644 index 1abb071..0000000 --- a/src/util.rs +++ /dev/null @@ -1,21 +0,0 @@ -use std::fmt::Debug; - -#[derive(Debug)] -pub enum State<D: Debug + Sized> { - Processing(D), - Ready -} - -impl<D> State<D> - where D: Debug + Sized -{ - pub fn processing(d: D) -> Self { - State::Processing(d) - } - - pub fn ready() -> Self { - State::Ready - } -} - - |