From edca92063823b46924696cf58053d38f2b84a5fc Mon Sep 17 00:00:00 2001 From: Jonatan Pettersson Date: Sat, 7 Sep 2024 21:58:48 +0200 Subject: [PATCH] Use FuturesOrdered; Fix from rebase conflict --- helix-term/src/commands/lsp.rs | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/helix-term/src/commands/lsp.rs b/helix-term/src/commands/lsp.rs index 69172c96e..24a780dde 100644 --- a/helix-term/src/commands/lsp.rs +++ b/helix-term/src/commands/lsp.rs @@ -1,7 +1,4 @@ -use futures_util::{ - stream::{FuturesOrdered, FuturesUnordered}, - FutureExt, -}; +use futures_util::{stream::FuturesOrdered, FutureExt}; use helix_lsp::{ block_on, lsp::{ @@ -628,7 +625,7 @@ pub fn code_action(cx: &mut Context) { let selection_range = doc.selection(view.id).primary(); - let mut futures: FuturesUnordered<_> = code_actions_for_range(doc, selection_range, None) + let mut futures: FuturesOrdered<_> = code_actions_for_range(doc, selection_range, None) .into_iter() .map(|(request, ls_id)| async move { let json = request.await?;