diff options
| author | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
|---|---|---|
| committer | Seivan Heidari <[email protected]> | 2019-12-23 14:35:31 +0000 |
| commit | b21d9337d9200e2cfdc90b386591c72c302dc03e (patch) | |
| tree | f81f5c08f821115cee26fa4d3ceaae88c7807fd5 /crates/ra_batch/src/lib.rs | |
| parent | 18a0937585b836ec5ed054b9ae48e0156ab6d9ef (diff) | |
| parent | ce07a2daa9e53aa86a769f8641b14c2878444fbc (diff) | |
Merge branch 'master' into feature/themes
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()); |