Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2024-12-28 05:53:45 +00:00
Code Issues Projects Releases Packages Wiki Activity

if_same_then_else

Browse source
This commit is contained in:
Johann Hemmann 2024-01-19 15:02:06 +01:00
parent c27b6b5308
commit 2ae2512378
2 changed files with 7 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.toml
View file

@ -174,7 +174,6 @@ derived_hash_with_manual_eq = "allow"
field_reassign_with_default = "allow" field_reassign_with_default = "allow"
forget_non_drop = "allow" forget_non_drop = "allow"
format_collect = "allow" format_collect = "allow"
if_same_then_else = "allow"
large_enum_variant = "allow" large_enum_variant = "allow"
match_like_matches_macro = "allow" match_like_matches_macro = "allow"
match_single_binding = "allow" match_single_binding = "allow"

15
crates/rust-analyzer/src/handlers/request.rs
View file

@ -1978,14 +1978,13 @@ fn run_rustfmt(
// approach: if the command name contains a path separator, join it with the workspace root. // approach: if the command name contains a path separator, join it with the workspace root.
// however, if the path is absolute, joining will result in the absolute path being preserved. // however, if the path is absolute, joining will result in the absolute path being preserved.
// as a fallback, rely on $PATH-based discovery. // as a fallback, rely on $PATH-based discovery.
let cmd_path = let cmd_path = if command.contains(std::path::MAIN_SEPARATOR)
if cfg!(windows) && command.contains([std::path::MAIN_SEPARATOR, '/']) { || (cfg!(windows) && command.contains('/'))
spec.workspace_root.join(cmd).into() {
} else if command.contains(std::path::MAIN_SEPARATOR) { spec.workspace_root.join(cmd).into()
spec.workspace_root.join(cmd).into() } else {
} else { cmd
cmd };
};
process::Command::new(cmd_path) process::Command::new(cmd_path)
} }
None => process::Command::new(cmd), None => process::Command::new(cmd),