From d594b7c6a252f127fb6db0ae005fe61f4eb7a390 Mon Sep 17 00:00:00 2001 From: Matthias Beyer Date: Sun, 28 Aug 2016 13:41:28 +0200 Subject: [PATCH] Reimplement libimagentrylink::external::is_external_link_storeid() using StoreId::is_in_collection() --- libimagentrylink/src/external.rs | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/libimagentrylink/src/external.rs b/libimagentrylink/src/external.rs index 11c524a0..171db965 100644 --- a/libimagentrylink/src/external.rs +++ b/libimagentrylink/src/external.rs @@ -91,16 +91,8 @@ pub trait ExternalLinker : InternalLinker { /// Check whether the StoreId starts with `/link/external/` pub fn is_external_link_storeid(id: &StoreId) -> bool { - use std::path::Component; - debug!("Checking whether this is a link/external/*: '{:?}'", id); - id.components() - .take(2) - .zip(&["link", "external"]) - .map(|(c, pred)| match c { - Component::Normal(ref s) => s.to_str().map(|ref s| s == pred).unwrap_or(false), - _ => false - }).all(|x| x) + id.is_in_collection(&["link", "external"]) } fn get_external_link_from_file(entry: &FileLockEntry) -> Result {