diff options
author | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-10 21:57:07 +0000 |
---|---|---|
committer | bors[bot] <bors[bot]@users.noreply.github.com> | 2019-01-10 21:57:07 +0000 |
commit | 28559b7dd2e2c101c4b7f2c9bb207b3af94f6e16 (patch) | |
tree | 7bee8dee5216b7eb459edaa0aad54f04dcef3f97 /crates/ra_lsp_server/src/main_loop | |
parent | b6bc55f542c88b1b0789435219f9dbf38c110f47 (diff) | |
parent | 6b7699d187d51e8a26ba1a18a217a77dd236458f (diff) |
Merge #489
489: support std r=matklad a=matklad
closes #465
Co-authored-by: Aleksey Kladov <[email protected]>
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/handlers.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/handlers.rs b/crates/ra_lsp_server/src/main_loop/handlers.rs index 069e7f932..0dda9548a 100644 --- a/crates/ra_lsp_server/src/main_loop/handlers.rs +++ b/crates/ra_lsp_server/src/main_loop/handlers.rs | |||
@@ -347,11 +347,11 @@ pub fn handle_runnables( | |||
347 | .read() | 347 | .read() |
348 | .file2path(ra_vfs::VfsFile(file_id.0.into())); | 348 | .file2path(ra_vfs::VfsFile(file_id.0.into())); |
349 | let res = world.workspaces.iter().find_map(|ws| { | 349 | let res = world.workspaces.iter().find_map(|ws| { |
350 | let tgt = ws.target_by_root(&path)?; | 350 | let tgt = ws.cargo.target_by_root(&path)?; |
351 | let res = CargoTargetSpec { | 351 | let res = CargoTargetSpec { |
352 | package: tgt.package(ws).name(ws).to_string(), | 352 | package: tgt.package(&ws.cargo).name(&ws.cargo).to_string(), |
353 | target: tgt.name(ws).to_string(), | 353 | target: tgt.name(&ws.cargo).to_string(), |
354 | target_kind: tgt.kind(ws), | 354 | target_kind: tgt.kind(&ws.cargo), |
355 | }; | 355 | }; |
356 | Some(res) | 356 | Some(res) |
357 | }); | 357 | }); |