aboutsummaryrefslogtreecommitdiff
path: root/editors/helix/files
diff options
context:
space:
mode:
authorAshish SHUKLA <ashish@FreeBSD.org>2023-05-19 23:24:47 +0000
committerAshish SHUKLA <ashish@FreeBSD.org>2023-05-20 06:41:42 +0000
commit903489fdada53e5a882d2b7cac9256cd68725a34 (patch)
tree54b11ccca06594a1e1720b6018fe56b43cc559df /editors/helix/files
parentb5551235f0a1d3f2e948f8a4b1e37bce4fa0d9f1 (diff)
downloadports-903489fdada53e5a882d2b7cac9256cd68725a34.tar.gz
ports-903489fdada53e5a882d2b7cac9256cd68725a34.zip
editors/helix: Update to 23.05
- Move CARGO_CRATES to its own file
Diffstat (limited to 'editors/helix/files')
-rw-r--r--editors/helix/files/patch-helix-loader_src_grammar.rs21
1 files changed, 9 insertions, 12 deletions
diff --git a/editors/helix/files/patch-helix-loader_src_grammar.rs b/editors/helix/files/patch-helix-loader_src_grammar.rs
index 87e8a114fba5..077f1ed949ef 100644
--- a/editors/helix/files/patch-helix-loader_src_grammar.rs
+++ b/editors/helix/files/patch-helix-loader_src_grammar.rs
@@ -1,6 +1,6 @@
---- helix-loader/src/grammar.rs.orig 2023-03-31 08:14:01 UTC
+--- helix-loader/src/grammar.rs.orig 2023-05-18 07:01:26 UTC
+++ helix-loader/src/grammar.rs
-@@ -89,60 +89,6 @@ pub fn fetch_grammars() -> Result<()> {
+@@ -90,57 +90,6 @@ pub fn fetch_grammars() -> Result<()> {
let mut grammars = get_grammar_configs()?;
grammars.retain(|grammar| !matches!(grammar.source, GrammarSource::Local { .. }));
@@ -12,15 +12,12 @@
- let mut git_up_to_date = 0;
- let mut non_git = Vec::new();
-
-- for res in results {
+- for (grammar_id, res) in results {
- match res {
- Ok(FetchStatus::GitUpToDate) => git_up_to_date += 1,
-- Ok(FetchStatus::GitUpdated {
-- grammar_id,
-- revision,
-- }) => git_updated.push((grammar_id, revision)),
-- Ok(FetchStatus::NonGit { grammar_id }) => non_git.push(grammar_id),
-- Err(e) => errors.push(e),
+- Ok(FetchStatus::GitUpdated { revision }) => git_updated.push((grammar_id, revision)),
+- Ok(FetchStatus::NonGit) => non_git.push(grammar_id),
+- Err(e) => errors.push((grammar_id, e)),
- }
- }
-
@@ -52,10 +49,10 @@
-
- if !errors.is_empty() {
- let len = errors.len();
-- println!("{} grammars failed to fetch", len);
-- for (i, error) in errors.into_iter().enumerate() {
-- println!("\tFailure {}/{}: {}", i + 1, len, error);
+- for (i, (grammar, error)) in errors.into_iter().enumerate() {
+- println!("Failure {}/{len}: {grammar} {error}", i + 1);
- }
+- bail!("{len} grammars failed to fetch");
- }
-
Ok(())