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_batch/src | |
| parent | 083010f6339e558184f06ce76a18e1ad0b0ee936 (diff) | |
| parent | 77db6177658b32f69ad7ebfdef96c1b3b2893fdd (diff) | |
Merge branch 'refs/heads/master' into feature/granular-scopes
Diffstat (limited to 'crates/ra_batch/src')
| -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()); |