diff options
| author | bors[bot] <26634292+bors[bot]@users.noreply.github.com> | 2019-12-14 11:57:49 +0000 |
|---|---|---|
| committer | GitHub <[email protected]> | 2019-12-14 11:57:49 +0000 |
| commit | 7238037de42a2fd88434930c521b926d7b0026da (patch) | |
| tree | 5bb6104ed70200be455ee685e7a69f04a9f70729 /crates/ra_lsp_server/src/main_loop.rs | |
| parent | 35b22312472b938d6549135f1fd932a26373e73e (diff) | |
| parent | f56a2a079069edafd74ef92b7e545f18be88b243 (diff) | |
Merge #2548
2548: Support setting cargo features and resolve `default` features by default r=matklad a=oxalica
Fixes #2524
Co-authored-by: oxalica <[email protected]>
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), |