diff options
-rw-r--r-- | crates/flycheck/src/lib.rs | 1 | ||||
-rw-r--r-- | crates/project_model/src/build_data.rs | 1 | ||||
-rw-r--r-- | crates/rust-analyzer/src/integrated_benchmarks.rs | 4 |
3 files changed, 4 insertions, 2 deletions
diff --git a/crates/flycheck/src/lib.rs b/crates/flycheck/src/lib.rs index 1682d8bde..93cf6a3d6 100644 --- a/crates/flycheck/src/lib.rs +++ b/crates/flycheck/src/lib.rs | |||
@@ -215,6 +215,7 @@ impl FlycheckActor { | |||
215 | } => { | 215 | } => { |
216 | let mut cmd = Command::new(toolchain::cargo()); | 216 | let mut cmd = Command::new(toolchain::cargo()); |
217 | cmd.arg(command); | 217 | cmd.arg(command); |
218 | cmd.current_dir(&self.workspace_root); | ||
218 | cmd.args(&["--workspace", "--message-format=json", "--manifest-path"]) | 219 | cmd.args(&["--workspace", "--message-format=json", "--manifest-path"]) |
219 | .arg(self.workspace_root.join("Cargo.toml")); | 220 | .arg(self.workspace_root.join("Cargo.toml")); |
220 | 221 | ||
diff --git a/crates/project_model/src/build_data.rs b/crates/project_model/src/build_data.rs index 7b88dca63..3aa546980 100644 --- a/crates/project_model/src/build_data.rs +++ b/crates/project_model/src/build_data.rs | |||
@@ -143,6 +143,7 @@ impl WorkspaceBuildData { | |||
143 | cmd.env("RA_RUSTC_WRAPPER", "1"); | 143 | cmd.env("RA_RUSTC_WRAPPER", "1"); |
144 | } | 144 | } |
145 | 145 | ||
146 | cmd.current_dir(cargo_toml.parent().unwrap()); | ||
146 | cmd.args(&["check", "--quiet", "--workspace", "--message-format=json", "--manifest-path"]) | 147 | cmd.args(&["check", "--quiet", "--workspace", "--message-format=json", "--manifest-path"]) |
147 | .arg(cargo_toml.as_ref()); | 148 | .arg(cargo_toml.as_ref()); |
148 | 149 | ||
diff --git a/crates/rust-analyzer/src/integrated_benchmarks.rs b/crates/rust-analyzer/src/integrated_benchmarks.rs index 56de9681c..ba2790acb 100644 --- a/crates/rust-analyzer/src/integrated_benchmarks.rs +++ b/crates/rust-analyzer/src/integrated_benchmarks.rs | |||
@@ -123,7 +123,7 @@ fn integrated_completion_benchmark() { | |||
123 | }; | 123 | }; |
124 | 124 | ||
125 | { | 125 | { |
126 | let _it = stdx::timeit("unqualified path completion"); | 126 | let _p = profile::span("unqualified path completion"); |
127 | let _span = profile::cpu_span(); | 127 | let _span = profile::cpu_span(); |
128 | let analysis = host.analysis(); | 128 | let analysis = host.analysis(); |
129 | let config = CompletionConfig { | 129 | let config = CompletionConfig { |
@@ -156,7 +156,7 @@ fn integrated_completion_benchmark() { | |||
156 | }; | 156 | }; |
157 | 157 | ||
158 | { | 158 | { |
159 | let _it = stdx::timeit("dot completion"); | 159 | let _p = profile::span("dot completion"); |
160 | let _span = profile::cpu_span(); | 160 | let _span = profile::cpu_span(); |
161 | let analysis = host.analysis(); | 161 | let analysis = host.analysis(); |
162 | let config = CompletionConfig { | 162 | let config = CompletionConfig { |