Move progress reporting to utils

1 files changed, 14 insertions, 10 deletions

diff --git a/crates/rust-analyzer/src/reload.rs b/crates/rust-analyzer/src/reload.rs
index a22d3e262..fece6176e 100644
--- a/crates/rust-analyzer/src/reload.rs
+++ b/crates/rust-analyzer/src/reload.rs
@@ -36,27 +36,31 @@ impl GlobalState {
             self.config
                 .linked_projects
                 .iter()
-                .filter_map(|project| match project {
+                .map(|project| match project {
                     LinkedProject::ProjectManifest(manifest) => {
                         ra_project_model::ProjectWorkspace::load(
                             manifest.clone(),
                             &self.config.cargo,
                             self.config.with_sysroot,
                         )
-                        .map_err(|err| {
-                            log::error!("failed to load workspace: {:#}", err);
-                            self.show_message(
-                                lsp_types::MessageType::Error,
-                                format!("rust-analyzer failed to load workspace: {:#}", err),
-                            );
-                        })
-                        .ok()
                     }
                     LinkedProject::InlineJsonProject(it) => {
-                        Some(ra_project_model::ProjectWorkspace::Json { project: it.clone() })
+                        Ok(ra_project_model::ProjectWorkspace::Json { project: it.clone() })
                     }
                 })
                 .collect::<Vec<_>>()
+                .into_iter()
+                .filter_map(|res| {
+                    res.map_err(|err| {
+                        log::error!("failed to load workspace: {:#}", err);
+                        self.show_message(
+                            lsp_types::MessageType::Error,
+                            format!("rust-analyzer failed to load workspace: {:#}", err),
+                        );
+                    })
+                    .ok()
+                })
+                .collect::<Vec<_>>()
         };
 
         if let FilesWatcher::Client = self.config.files.watcher {