Mirrors/rust-analyzer
2
0
Fork 0
mirror of https://github.com/rust-lang/rust-analyzer synced 2025-01-12 13:18:47 +00:00
Code Issues Projects Releases Packages Wiki Activity

Try to find rustfmt in more places

Browse source
This commit is contained in:
Aleksey Kladov 2020-06-27 01:28:06 +02:00
parent f5584668db
commit 9617bb4f07
4 changed files with 7 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
Cargo.lock generated
View file

@ -1395,6 +1395,7 @@ dependencies = [
"ra_project_model",
"ra_syntax",
"ra_text_edit",
"ra_toolchain",
"ra_tt",
"rand",
"rustc-hash",

4
crates/ra_toolchain/src/lib.rs
View file

@ -15,6 +15,10 @@ pub fn rustup() -> PathBuf {
get_path_for_executable("rustup")
}
pub fn rustfmt() -> PathBuf {
get_path_for_executable("rustfmt")
}
/// Return a `PathBuf` to use for the given executable.
///
/// E.g., `get_path_for_executable("cargo")` may return just `cargo` if that

1
crates/rust-analyzer/Cargo.toml
View file

@ -41,6 +41,7 @@ ra_text_edit = { path = "../ra_text_edit" }
vfs = { path = "../vfs" }
vfs-notify = { path = "../vfs-notify" }
ra_cfg = { path = "../ra_cfg"}
ra_toolchain = { path = "../ra_toolchain" }
# This should only be used in CLI
ra_db = { path = "../ra_db" }

2
crates/rust-analyzer/src/handlers.rs
View file

@ -650,7 +650,7 @@ pub(crate) fn handle_formatting(
let mut rustfmt = match &snap.config.rustfmt {
RustfmtConfig::Rustfmt { extra_args } => {
let mut cmd = process::Command::new("rustfmt");
let mut cmd = process::Command::new(ra_toolchain::rustfmt());
cmd.args(extra_args);
if let Some(&crate_id) = crate_ids.first() {
// Assume all crates are in the same edition