avoid collecting columns to a temporary vec

postsolar · Apr 4, 2024 · 4ff3fd4 · 4ff3fd4
1 parent d2e4c4f
commit 4ff3fd4
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 12 deletions.
diff --git a/Cargo.lock b/Cargo.lock
diff --git a/Cargo.toml b/Cargo.toml
@@ -38,7 +38,7 @@ package.helix-term.opt-level = 2
 
 [workspace.dependencies]
 tree-sitter = { version = "0.22" }
-nucleo = "0.4.1"
+nucleo = "0.5.0"
 
 [workspace.package]
 version = "24.3.0"

diff --git a/helix-term/src/ui/picker.rs b/helix-term/src/ui/picker.rs
@@ -14,7 +14,7 @@ use crate::{
 use futures_util::future::BoxFuture;
 use helix_event::AsyncHook;
 use nucleo::pattern::{CaseMatching, Normalization};
-use nucleo::{Config, Nucleo, Utf32String};
+use nucleo::{Config, Nucleo};
 use thiserror::Error;
 use tokio::sync::mpsc::Sender;
 use tui::{
@@ -134,14 +134,9 @@ fn inject_nucleo_item<T, D>(
     item: T,
     editor_data: &D,
 ) {
-    let column_texts: Vec<Utf32String> = columns
-        .iter()
-        .filter(|column| column.filter)
-        .map(|column| column.format_text(&item, editor_data).into())
-        .collect();
-    injector.push(item, |dst| {
-        for (i, text) in column_texts.into_iter().enumerate() {
-            dst[i] = text;
+    injector.push(item, |item, dst| {
+        for (column, text) in columns.iter().filter(|column| column.filter).zip(dst) {
+            *text = column.format_text(&item, editor_data).into()
         }
     });
 }