Fix a bunch of other low-hanging style lints (#36498)
- **Fix a bunch of low hanging style lints like unnecessary-return** - **Fix single worktree violation** - **And the rest** Release Notes: - N/A
This commit is contained in:
parent
df9c2aefb1
commit
05fc0c432c
239 changed files with 854 additions and 1015 deletions
|
@ -452,7 +452,7 @@ async fn get_cached_server_binary(container_dir: PathBuf) -> Option<LanguageServ
|
|||
&& entry
|
||||
.file_name()
|
||||
.to_str()
|
||||
.map_or(false, |name| name.starts_with("gopls_"))
|
||||
.is_some_and(|name| name.starts_with("gopls_"))
|
||||
{
|
||||
last_binary_path = Some(entry.path());
|
||||
}
|
||||
|
|
|
@ -280,7 +280,7 @@ impl JsonLspAdapter {
|
|||
)
|
||||
})?;
|
||||
writer.replace(config.clone());
|
||||
return Ok(config);
|
||||
Ok(config)
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -828,7 +828,7 @@ impl ToolchainLister for PythonToolchainProvider {
|
|||
.get_env_var("CONDA_PREFIX".to_string())
|
||||
.map(|conda_prefix| {
|
||||
let is_match = |exe: &Option<PathBuf>| {
|
||||
exe.as_ref().map_or(false, |e| e.starts_with(&conda_prefix))
|
||||
exe.as_ref().is_some_and(|e| e.starts_with(&conda_prefix))
|
||||
};
|
||||
match (is_match(&lhs.executable), is_match(&rhs.executable)) {
|
||||
(true, false) => Ordering::Less,
|
||||
|
|
|
@ -403,7 +403,7 @@ impl LspAdapter for RustLspAdapter {
|
|||
} else if completion
|
||||
.detail
|
||||
.as_ref()
|
||||
.map_or(false, |detail| detail.starts_with("macro_rules! "))
|
||||
.is_some_and(|detail| detail.starts_with("macro_rules! "))
|
||||
{
|
||||
let text = completion.label.clone();
|
||||
let len = text.len();
|
||||
|
@ -496,7 +496,7 @@ impl LspAdapter for RustLspAdapter {
|
|||
let enable_lsp_tasks = ProjectSettings::get_global(cx)
|
||||
.lsp
|
||||
.get(&SERVER_NAME)
|
||||
.map_or(false, |s| s.enable_lsp_tasks);
|
||||
.is_some_and(|s| s.enable_lsp_tasks);
|
||||
if enable_lsp_tasks {
|
||||
let experimental = json!({
|
||||
"runnables": {
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue