From 9fcebbc51284408203c05219a0ee92519f51ea74 Mon Sep 17 00:00:00 2001
From: Aleksey Kladov <aleksey.kladov@gmail.com>
Date: Thu, 30 Aug 2018 16:27:09 +0300
Subject: subscriptions

---
 crates/libanalysis/src/imp.rs | 20 +++++++++-----------
 1 file changed, 9 insertions(+), 11 deletions(-)

(limited to 'crates/libanalysis/src/imp.rs')

diff --git a/crates/libanalysis/src/imp.rs b/crates/libanalysis/src/imp.rs
index 004942e72..97802bd50 100644
--- a/crates/libanalysis/src/imp.rs
+++ b/crates/libanalysis/src/imp.rs
@@ -39,11 +39,11 @@ impl AnalysisHostImpl {
 
     pub fn analysis(
         &self,
-        file_resolver: impl FileResolver,
+        file_resolver: Arc<dyn FileResolver>,
     ) -> AnalysisImpl {
         AnalysisImpl {
             needs_reindex: AtomicBool::new(false),
-            file_resolver: Arc::new(file_resolver),
+            file_resolver,
             data: self.data.clone(),
         }
     }
@@ -78,7 +78,7 @@ impl AnalysisHostImpl {
 
 pub(crate) struct AnalysisImpl {
     needs_reindex: AtomicBool,
-    file_resolver: Arc<FileResolver>,
+    file_resolver: Arc<dyn FileResolver>,
     data: Arc<WorldData>,
 }
 
@@ -236,15 +236,13 @@ impl AnalysisImpl {
             ("add `#[derive]`", libeditor::add_derive(&file, offset).map(|f| f())),
             ("add impl", libeditor::add_impl(&file, offset).map(|f| f())),
         ];
-        let mut res = Vec::new();
-        for (name, local_edit) in actions {
-            if let Some(local_edit) = local_edit {
-                res.push(SourceChange::from_local_edit(
-                    file_id, name, local_edit
+        actions.into_iter()
+            .filter_map(|(name, local_edit)| {
+                Some(SourceChange::from_local_edit(
+                    file_id, name, local_edit?,
                 ))
-            }
-        }
-        res
+            })
+            .collect()
     }
 
     fn index_resolve(&self, name_ref: ast::NameRef) -> Vec<(FileId, FileSymbol)> {
-- 
cgit v1.2.3