diff options
author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-05 12:26:16 +0100 |
---|---|---|
committer | GitHub <[email protected]> | 2020-08-05 12:26:16 +0100 |
commit | 2ad29eb23167273f2e101b44c1f21b4ec2821bc2 (patch) | |
tree | 2f9c8aaecb61c6dfc80a8b533dd3e09b00bd220d | |
parent | af6e9a7eb3c321ea43d3ac14c2b05f8c58e1abac (diff) | |
parent | ffe4a5e114a1b62620546c20f3621b2151d4eeb7 (diff) |
Merge #5668
5668: Fix relative path handling for custom rustfmt r=matklad a=matklad
`current_dir` and relative paths to executables works differently on
unix and windows (unix behavior does not make sense), see:
https://github.com/oconnor663/duct.rs/blob/17e30e83a16b202551df4d70d0b2cc174cb53e5d/src/lib.rs#L295-L324
The original motivation to set cwd was to make rustfmt read the
correct rustfmt.toml, but that was future proofing, rather than a bug
fix.
So, let's just remove this and see if breaks or fixes more use-cases.
If support for per-file config is needed, we could use `--config-path`
flag.
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
-rw-r--r-- | crates/rust-analyzer/src/handlers.rs | 5 |
1 files changed, 0 insertions, 5 deletions
diff --git a/crates/rust-analyzer/src/handlers.rs b/crates/rust-analyzer/src/handlers.rs index e73b3a211..82f6de5da 100644 --- a/crates/rust-analyzer/src/handlers.rs +++ b/crates/rust-analyzer/src/handlers.rs | |||
@@ -709,11 +709,6 @@ pub(crate) fn handle_formatting( | |||
709 | } | 709 | } |
710 | }; | 710 | }; |
711 | 711 | ||
712 | if let Ok(path) = params.text_document.uri.to_file_path() { | ||
713 | if let Some(parent) = path.parent() { | ||
714 | rustfmt.current_dir(parent); | ||
715 | } | ||
716 | } | ||
717 | let mut rustfmt = rustfmt.stdin(Stdio::piped()).stdout(Stdio::piped()).spawn()?; | 712 | let mut rustfmt = rustfmt.stdin(Stdio::piped()).stdout(Stdio::piped()).spawn()?; |
718 | 713 | ||
719 | rustfmt.stdin.as_mut().unwrap().write_all(file.as_bytes())?; | 714 | rustfmt.stdin.as_mut().unwrap().write_all(file.as_bytes())?; |