From c343b1d66142e3ef2d76ea4b6fdc96c1da44dd83 Mon Sep 17 00:00:00 2001 From: AltCode Date: Wed, 22 Apr 2026 21:43:10 +0200 Subject: [PATCH] Relax type for `language_server_id` --- src/language_servers/config.rs | 6 +++--- src/language_servers/util.rs | 10 ++-------- 2 files changed, 5 insertions(+), 11 deletions(-) diff --git a/src/language_servers/config.rs b/src/language_servers/config.rs index 3323ef5..cb88817 100644 --- a/src/language_servers/config.rs +++ b/src/language_servers/config.rs @@ -5,7 +5,7 @@ use zed_extension_api::{ }; pub(super) fn get_initialization_options( - language_server_id: &'static str, + language_server_id: &str, worktree: &Worktree, ) -> Option { LspSettings::for_worktree(language_server_id, worktree) @@ -14,7 +14,7 @@ pub(super) fn get_initialization_options( } pub(super) fn get_workspace_configuration( - language_server_id: &'static str, + language_server_id: &str, worktree: &Worktree, ) -> Option { LspSettings::for_worktree(language_server_id, worktree) @@ -23,7 +23,7 @@ pub(super) fn get_workspace_configuration( } pub(super) fn get_binary_settings( - language_server_id: &'static str, + language_server_id: &str, worktree: &Worktree, ) -> Option { LspSettings::for_worktree(language_server_id, worktree) diff --git a/src/language_servers/util.rs b/src/language_servers/util.rs index 1d34ec8..00ebb86 100644 --- a/src/language_servers/util.rs +++ b/src/language_servers/util.rs @@ -2,10 +2,7 @@ use std::fs; use zed_extension_api::Result; -pub(super) fn remove_outdated_versions( - language_server_id: &'static str, - version_dir: &str, -) -> Result<()> { +pub(super) fn remove_outdated_versions(language_server_id: &str, version_dir: &str) -> Result<()> { let entries = fs::read_dir(".").map_err(|e| format!("failed to list working directory {e}"))?; for entry in entries { let entry = entry.map_err(|e| format!("failed to load directory entry {e}"))?; @@ -18,10 +15,7 @@ pub(super) fn remove_outdated_versions( Ok(()) } -pub(super) fn find_existing_binary( - language_server_id: &'static str, - binary_name: &str, -) -> Option { +pub(super) fn find_existing_binary(language_server_id: &str, binary_name: &str) -> Option { fs::read_dir(".").ok()?.flatten().find_map(|entry| { let binary_path = entry.path().join(binary_name);