summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthias Beyer <mail@beyermatthias.de>2020-02-21 17:33:32 +0100
committerMatthias Beyer <mail@beyermatthias.de>2020-02-21 17:33:32 +0100
commit00c107f9528e782aea72e324774176b3966320f4 (patch)
treecd6890a20916fd4ba45e5dfa5388c312c2a459cd
parentf921dd4267265ad173da553524b301f83a41c5da (diff)
Revert "Check whether entry is borrowed before using it"
This did not fix our error, so rather revert it right here before it ends up in master and breaks other things. This reverts commit f921dd4267265ad173da553524b301f83a41c5da.
-rw-r--r--lib/domain/libimagmail/src/mailtree.rs9
1 files changed, 0 insertions, 9 deletions
diff --git a/lib/domain/libimagmail/src/mailtree.rs b/lib/domain/libimagmail/src/mailtree.rs
index f2474b79..37926a47 100644
--- a/lib/domain/libimagmail/src/mailtree.rs
+++ b/lib/domain/libimagmail/src/mailtree.rs
@@ -17,8 +17,6 @@
// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
//
-use std::path::PathBuf;
-
use failure::Fallible as Result;
use failure::ResultExt;
use indextree::Arena;
@@ -26,13 +24,10 @@ use indextree::NodeId;
use indextree::Node;
use itertools::Itertools;
-use libimagstore::storeid::StoreId;
-
use crate::store::MailStoreWithConnection;
use crate::mail::Mail;
use crate::mail::LoadedMail;
-
#[derive(Debug)]
pub struct Mailtree {
arena: Arena<String>,
@@ -99,10 +94,6 @@ fn fill_arena_with<'a>(arena: &mut Arena<String>, store: &'a MailStoreWithConnec
})?
.into_iter()
.map(|id: String| {
- let sid = StoreId::new(PathBuf::from(id.clone()))?;
- if store.is_borrowed(sid)? {
- return Ok(())
- }
let mail = store.get_mail_by_id(&id)
.context("Getting mail by id")?
.ok_or_else(|| format_err!("Cannot find mail for id {}", id))?;