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_batch/src/lib.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_batch/src/lib.rs')
-rw-r--r-- | crates/ra_batch/src/lib.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/ra_batch/src/lib.rs b/crates/ra_batch/src/lib.rs index 2c9645c00..7744ba85a 100644 --- a/crates/ra_batch/src/lib.rs +++ b/crates/ra_batch/src/lib.rs | |||
@@ -22,7 +22,7 @@ fn vfs_root_to_id(r: ra_vfs::VfsRoot) -> SourceRootId { | |||
22 | 22 | ||
23 | pub fn load_cargo(root: &Path) -> Result<(AnalysisHost, FxHashMap<SourceRootId, PackageRoot>)> { | 23 | pub fn load_cargo(root: &Path) -> Result<(AnalysisHost, FxHashMap<SourceRootId, PackageRoot>)> { |
24 | let root = std::env::current_dir()?.join(root); | 24 | let root = std::env::current_dir()?.join(root); |
25 | let ws = ProjectWorkspace::discover(root.as_ref())?; | 25 | let ws = ProjectWorkspace::discover(root.as_ref(), &Default::default())?; |
26 | let project_roots = ws.to_roots(); | 26 | let project_roots = ws.to_roots(); |
27 | let (sender, receiver) = unbounded(); | 27 | let (sender, receiver) = unbounded(); |
28 | let sender = Box::new(move |t| sender.send(t).unwrap()); | 28 | let sender = Box::new(move |t| sender.send(t).unwrap()); |