From 31b7596f093c313bc88867f3ba2ae9813f7c55d4 Mon Sep 17 00:00:00 2001
From: Skyler Hawthorne <skyler@dead10ck.com>
Date: Sat, 19 Feb 2022 00:45:22 -0500
Subject: [PATCH] fix context in error

---
 helix-loader/src/grammar.rs | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

diff --git a/helix-loader/src/grammar.rs b/helix-loader/src/grammar.rs
index 61ef464fc..4fe7fd04c 100644
--- a/helix-loader/src/grammar.rs
+++ b/helix-loader/src/grammar.rs
@@ -123,18 +123,14 @@ where
             tx.send(job(grammar)).unwrap();
         });
     }
-    pool.join();
+
+    drop(tx);
 
     // TODO: print all failures instead of the first one found.
-    if let Some(failure) = rx.try_iter().find_map(|result| result.err()) {
-        Err(anyhow!(
-            "Failed to {} some grammar(s).\n{}",
-            action,
-            failure
-        ))
-    } else {
-        Ok(())
-    }
+    rx.iter()
+        .find(|result| result.is_err())
+        .map(|err| err.with_context(|| format!("Failed to {} some grammar(s)", action)))
+        .unwrap_or(Ok(()))
 }
 
 fn fetch_grammar(grammar: GrammarConfiguration) -> Result<()> {