Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/language_servers/config.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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<Value> {
LspSettings::for_worktree(language_server_id, worktree)
Expand All @@ -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<Value> {
LspSettings::for_worktree(language_server_id, worktree)
Expand All @@ -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<CommandSettings> {
LspSettings::for_worktree(language_server_id, worktree)
Expand Down
10 changes: 2 additions & 8 deletions src/language_servers/util.rs
Original file line number Diff line number Diff line change
Expand Up @@ -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}"))?;
Expand All @@ -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<String> {
pub(super) fn find_existing_binary(language_server_id: &str, binary_name: &str) -> Option<String> {
fs::read_dir(".").ok()?.flatten().find_map(|entry| {
let binary_path = entry.path().join(binary_name);

Expand Down
Loading