diff options
| author | Omer Ben-Amram <[email protected]> | 2019-12-14 15:29:30 +0000 |
|---|---|---|
| committer | Omer Ben-Amram <[email protected]> | 2019-12-14 15:29:30 +0000 |
| commit | 5e4e713fc9c201852fc5fbafd57e5b9243149a78 (patch) | |
| tree | 996b679a9ae1d07be1edd9eb04e93d433c6524a3 /crates/ra_lsp_server/src/main_loop.rs | |
| parent | 083010f6339e558184f06ce76a18e1ad0b0ee936 (diff) | |
| parent | 77db6177658b32f69ad7ebfdef96c1b3b2893fdd (diff) | |
Merge branch 'refs/heads/master' into feature/granular-scopes
Diffstat (limited to 'crates/ra_lsp_server/src/main_loop.rs')
| -rw-r--r-- | crates/ra_lsp_server/src/main_loop.rs | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crates/ra_lsp_server/src/main_loop.rs b/crates/ra_lsp_server/src/main_loop.rs index 158cac0be..965e7c53c 100644 --- a/crates/ra_lsp_server/src/main_loop.rs +++ b/crates/ra_lsp_server/src/main_loop.rs | |||
| @@ -67,6 +67,7 @@ pub fn main_loop( | |||
| 67 | let workspace = ra_project_model::ProjectWorkspace::discover_with_sysroot( | 67 | let workspace = ra_project_model::ProjectWorkspace::discover_with_sysroot( |
| 68 | ws_root.as_path(), | 68 | ws_root.as_path(), |
| 69 | config.with_sysroot, | 69 | config.with_sysroot, |
| 70 | &config.cargo_features, | ||
| 70 | ); | 71 | ); |
| 71 | match workspace { | 72 | match workspace { |
| 72 | Ok(workspace) => loaded_workspaces.push(workspace), | 73 | Ok(workspace) => loaded_workspaces.push(workspace), |