From 6dd247b37151da9ec76c541651ab22462a919167 Mon Sep 17 00:00:00 2001 From: Manos Pitsidianakis Date: Wed, 18 Jul 2018 12:47:23 +0300 Subject: [PATCH] Remove useless eprintlns --- src/mailbox/accounts.rs | 16 -------------- src/mailbox/backends/maildir.rs | 39 --------------------------------- src/mailbox/email/mod.rs | 3 --- src/ui/mod.rs | 1 - 4 files changed, 59 deletions(-) diff --git a/src/mailbox/accounts.rs b/src/mailbox/accounts.rs index d2a99af6..aa105f4f 100644 --- a/src/mailbox/accounts.rs +++ b/src/mailbox/accounts.rs @@ -38,7 +38,6 @@ pub struct Account { impl Account { pub fn new(name: String, settings: AccountSettings, backends: &Backends) -> Self { - eprintln!("new acc"); let sent_folder = settings .folders .iter() @@ -83,20 +82,13 @@ impl Index for Account { impl IndexMut for Account { fn index_mut(&mut self, index: usize) -> &mut Option> { if self.folders[index].is_none() { - eprintln!("building folder {:?}", self.settings.folders[index]); let folder = &self.settings.folders[index]; let path = folder.get_path().clone(); if self.sent_folder.is_some() { let id = self.sent_folder.unwrap(); if id == index { - eprintln!("building sent_folder.."); self.folders[index] = Some(Mailbox::new(folder, &None, self.backend.get(&folder))); - eprintln!("Done!"); } else { - eprintln!( - "Now building folder {:?} with sent_folder", - self.settings.folders[index] - ); let (sent, cur) = { let ptr = self.folders.as_mut_ptr(); unsafe { @@ -109,20 +101,12 @@ impl IndexMut for Account { }; let sent_path = &self.settings.folders[id]; if sent[0].is_none() { - eprintln!("\tbuilding sent_folder.."); sent[0] = Some(Mailbox::new(sent_path, &None, self.backend.get(&folder))); - eprintln!("\tDone!"); } cur[0] = Some(Mailbox::new(folder, &sent[0],self.backend.get(folder))); - eprintln!("Done!"); } } else { - eprintln!( - "Now building folder {:?} without sent_folder", - self.settings.folders[index] - ); self.folders[index] = Some(Mailbox::new(folder, &None,self.backend.get(&folder))); - eprintln!("Done!"); }; } &mut self.folders[index] diff --git a/src/mailbox/backends/maildir.rs b/src/mailbox/backends/maildir.rs index 21124917..c5b5b610 100644 --- a/src/mailbox/backends/maildir.rs +++ b/src/mailbox/backends/maildir.rs @@ -125,27 +125,6 @@ pub struct MaildirType { impl MailBackend for MaildirType { fn get(&self, folder: &Folder) -> Result> { self.get_multicore(4, folder) - /* - - MaildirType::is_valid(&self.path)?; - let mut path = PathBuf::from(&self.path); - path.push("cur"); - let iter = path.read_dir()?; - let count = path.read_dir()?.count(); - let mut r = Vec::with_capacity(count); - for e in iter { - //eprintln!("{:?}", e); - let e = e.and_then(|x| { - let path = x.path(); - Ok(path.to_str().unwrap().to_string()) - })?; - match Mail::from(&e) { - Some(e) => {r.push(e);}, - None => {} - } - } - Ok(r) - */ } fn watch(&self, sender: RefreshEventConsumer, folders: &[Folder]) -> () { let folders = folders.to_vec(); @@ -158,7 +137,6 @@ impl MailBackend for MaildirType { continue; } let mut p = PathBuf::from(&f.get_path()); - eprintln!("watching {:?}", f); p.push("cur"); watcher.watch(&p, RecursiveMode::NonRecursive).unwrap(); p.pop(); @@ -212,28 +190,11 @@ impl MaildirType { let mut files: Vec = Vec::with_capacity(count); let mut r = Vec::with_capacity(count); for e in iter { - //eprintln!("{:?}", e); let e = e.and_then(|x| { let path = x.path(); Ok(path.to_str().unwrap().to_string()) })?; files.push(e); - /* - - f.read_to_end(&mut buffer)?; - eprintln!("{:?}", String::from_utf8(buffer.clone()).unwrap()); - let m = match Email::parse(&buffer) { - Ok((v, rest)) => match rest.len() { - 0 => v, - _ => - { eprintln!("{:?}", String::from_utf8(rest.to_vec()).unwrap()); -panic!("didn't parse"); }, - }, - Err(v) => panic!(v), - }; - - r.push(m); - */ } let mut threads = Vec::with_capacity(cores); if !files.is_empty() { diff --git a/src/mailbox/email/mod.rs b/src/mailbox/email/mod.rs index e12d9f3d..b8779733 100644 --- a/src/mailbox/email/mod.rs +++ b/src/mailbox/email/mod.rs @@ -346,7 +346,6 @@ pub fn get_date(&self) -> i64 { let slice = match parser::message_id(new_val.as_bytes()).to_full_result() { Ok(v) => v, Err(v) => { - eprintln!("{} {:?}", new_val, v); self.in_reply_to = None; return; } @@ -360,7 +359,6 @@ pub fn get_date(&self) -> i64 { let slice = match parser::message_id(new_val.as_bytes()).to_full_result() { Ok(v) => v, Err(v) => { - eprintln!("{} {:?}", new_val, v); self.message_id = None; return; } @@ -371,7 +369,6 @@ pub fn get_date(&self) -> i64 { let slice = match parser::message_id(new_val.as_bytes()).to_full_result() { Ok(v) => v, Err(v) => { - eprintln!("{} {:?}", new_val, v); return; } }; diff --git a/src/ui/mod.rs b/src/ui/mod.rs index ce2ff32f..e0857362 100644 --- a/src/ui/mod.rs +++ b/src/ui/mod.rs @@ -280,7 +280,6 @@ impl State { eprintln!("received command: {}", cmd); let result = goto(&cmd.as_bytes()).to_full_result(); - eprintln!("result is {:?}", result); if let Ok(v) = result { self.refresh_mailbox(0, v);