diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2020-08-12 16:04:52 +0100 |
|---|---|---|
| committer | GitHub <[email protected]> | 2020-08-12 16:04:52 +0100 |
| commit | a573e088ac64eeeb19e4fc74be2ff019be510477 (patch) | |
| tree | 392c214055eab6a713814d46435bc0d91cf84e6c /crates/flycheck | |
| parent | 6dba0e1c4de3b225556f7fce70518c8ebff170a6 (diff) | |
| parent | 6dafc13f5f776980cd2560fb79d3d4790811c96d (diff) | |
Merge #5726
5726: Rename ra_text_edit -> text_edit
r=matklad a=matklad
bors r+
🤖
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/flycheck')
| -rw-r--r-- | crates/flycheck/Cargo.toml | 2 | ||||
| -rw-r--r-- | crates/flycheck/src/lib.rs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/crates/flycheck/Cargo.toml b/crates/flycheck/Cargo.toml index ff8a1e568..acc72bc59 100644 --- a/crates/flycheck/Cargo.toml +++ b/crates/flycheck/Cargo.toml | |||
| @@ -14,4 +14,4 @@ log = "0.4.8" | |||
| 14 | cargo_metadata = "0.11.1" | 14 | cargo_metadata = "0.11.1" |
| 15 | serde_json = "1.0.48" | 15 | serde_json = "1.0.48" |
| 16 | jod-thread = "0.1.1" | 16 | jod-thread = "0.1.1" |
| 17 | ra_toolchain = { path = "../ra_toolchain" } | 17 | toolchain = { path = "../toolchain" } |
diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs index 31e14246d..16078d104 100644 --- a/crates/flycheck/src/lib.rs +++ b/crates/flycheck/src/lib.rs | |||
| @@ -193,7 +193,7 @@ impl FlycheckActor { | |||
| 193 | extra_args, | 193 | extra_args, |
| 194 | features, | 194 | features, |
| 195 | } => { | 195 | } => { |
| 196 | let mut cmd = Command::new(ra_toolchain::cargo()); | 196 | let mut cmd = Command::new(toolchain::cargo()); |
| 197 | cmd.arg(command); | 197 | cmd.arg(command); |
| 198 | cmd.args(&["--workspace", "--message-format=json", "--manifest-path"]) | 198 | cmd.args(&["--workspace", "--message-format=json", "--manifest-path"]) |
| 199 | .arg(self.workspace_root.join("Cargo.toml")); | 199 | .arg(self.workspace_root.join("Cargo.toml")); |