Yehowshua/ZIm
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Remove unneeded 'static lifetimes on &strs in constants (#8698)

Browse source 
This PR removes unneeded `'static` lifetimes on `&str`s stored in
`const` declarations.

This addresses some Clippy lints about
[`redundant_static_lifetimes`](https://rust-lang.github.io/rust-clippy/master/index.html#/redundant_static_lifetimes).

In item-level `const` declarations we can rely on lifetime elision and
use the default `'static` lifetime.

Note that associated constants still require an explicit `'static`
lifetime, as explained in
https://github.com/rust-lang/rust/issues/115010.

Release Notes:

- N/A
This commit is contained in:
Marshall Bowers 2024-03-02 00:40:49 -05:00 • committed by GitHub
parent 5c2bd816ae
commit ca2cda8d2a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
32 changed files with 50 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

2
crates/languages/src/astro.rs
View file

@ -14,7 +14,7 @@ use std::{
};
use util::ResultExt;
const SERVER_PATH: &'static str = "node_modules/@astrojs/language-server/bin/nodeServer.js";
const SERVER_PATH: &str = "node_modules/@astrojs/language-server/bin/nodeServer.js";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

2
crates/languages/src/css.rs
View file

@ -14,7 +14,7 @@ use std::{
};
use util::{async_maybe, ResultExt};
const SERVER_PATH: &'static str =
const SERVER_PATH: &str =
"node_modules/vscode-langservers-extracted/bin/vscode-css-language-server";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {

3
crates/languages/src/dockerfile.rs
View file

@ -13,8 +13,7 @@ use std::{
};
use util::{async_maybe, ResultExt};
const SERVER_PATH: &'static str =
"node_modules/dockerfile-language-server-nodejs/bin/docker-langserver";
const SERVER_PATH: &str = "node_modules/dockerfile-language-server-nodejs/bin/docker-langserver";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

4
crates/languages/src/elm.rs
View file

@ -17,8 +17,8 @@ use std::{
};
use util::ResultExt;
const SERVER_NAME: &'static str = "elm-language-server";
const SERVER_PATH: &'static str = "node_modules/@elm-tooling/elm-language-server/out/node/index.js";
const SERVER_NAME: &str = "elm-language-server";
const SERVER_PATH: &str = "node_modules/@elm-tooling/elm-language-server/out/node/index.js";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

2
crates/languages/src/html.rs
View file

@ -14,7 +14,7 @@ use std::{
};
use util::{async_maybe, ResultExt};
const SERVER_PATH: &'static str =
const SERVER_PATH: &str =
"node_modules/vscode-langservers-extracted/bin/vscode-html-language-server";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {

3
crates/languages/src/json.rs
View file

@ -18,8 +18,7 @@ use std::{
};
use util::{async_maybe, paths, ResultExt};
const SERVER_PATH: &'static str =
"node_modules/vscode-json-languageserver/bin/vscode-json-languageserver";
const SERVER_PATH: &str = "node_modules/vscode-json-languageserver/bin/vscode-json-languageserver";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

2
crates/languages/src/prisma.rs
View file

@ -13,7 +13,7 @@ use std::{
};
use util::{async_maybe, ResultExt};
const SERVER_PATH: &'static str = "node_modules/.bin/prisma-language-server";
const SERVER_PATH: &str = "node_modules/.bin/prisma-language-server";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

2
crates/languages/src/purescript.rs
View file

@ -15,7 +15,7 @@ use std::{
};
use util::{async_maybe, ResultExt};
const SERVER_PATH: &'static str = "node_modules/.bin/purescript-language-server";
const SERVER_PATH: &str = "node_modules/.bin/purescript-language-server";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

2
crates/languages/src/python.rs
View file

@ -12,7 +12,7 @@ use std::{
};
use util::ResultExt;
const SERVER_PATH: &'static str = "node_modules/pyright/langserver.index.js";
const SERVER_PATH: &str = "node_modules/pyright/langserver.index.js";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

2
crates/languages/src/svelte.rs
View file

@ -14,7 +14,7 @@ use std::{
};
use util::{async_maybe, ResultExt};
const SERVER_PATH: &'static str = "node_modules/svelte-language-server/bin/server.js";
const SERVER_PATH: &str = "node_modules/svelte-language-server/bin/server.js";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

2
crates/languages/src/tailwind.rs
View file

@ -16,7 +16,7 @@ use std::{
};
use util::{async_maybe, ResultExt};
const SERVER_PATH: &'static str = "node_modules/.bin/tailwindcss-language-server";
const SERVER_PATH: &str = "node_modules/.bin/tailwindcss-language-server";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]

2
crates/languages/src/yaml.rs
View file

@ -17,7 +17,7 @@ use std::{
};
use util::{async_maybe, ResultExt};
const SERVER_PATH: &'static str = "node_modules/yaml-language-server/bin/yaml-language-server";
const SERVER_PATH: &str = "node_modules/yaml-language-server/bin/yaml-language-server";
fn server_binary_arguments(server_path: &Path) -> Vec<OsString> {
vec![server_path.into(), "--stdio".into()]