diff options
| author | Kirill Bulatov <[email protected]> | 2020-03-30 11:16:09 +0100 |
|---|---|---|
| committer | Kirill Bulatov <[email protected]> | 2020-03-30 11:39:14 +0100 |
| commit | 8e78371222ac6ce45afd12c143f472e0674834b4 (patch) | |
| tree | 4008b2b2e7c3170b40b9cd62bf4e961cc564ff2b | |
| parent | 2a19459ee91ce2ee002c6d5fa4a53bc446d11d60 (diff) | |
Rebase fixes
| -rw-r--r-- | crates/rust-analyzer/src/world.rs | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crates/rust-analyzer/src/world.rs b/crates/rust-analyzer/src/world.rs index 01084f818..ad096a1d8 100644 --- a/crates/rust-analyzer/src/world.rs +++ b/crates/rust-analyzer/src/world.rs | |||
| @@ -31,7 +31,7 @@ use crate::{ | |||
| 31 | use ra_db::ExternSourceId; | 31 | use ra_db::ExternSourceId; |
| 32 | use rustc_hash::{FxHashMap, FxHashSet}; | 32 | use rustc_hash::{FxHashMap, FxHashSet}; |
| 33 | 33 | ||
| 34 | fn create_watcher(workspaces: &[ProjectWorkspace], options: &Options) -> CheckWatcher { | 34 | fn create_watcher(workspaces: &[ProjectWorkspace], options: &Options) -> Option<CheckWatcher> { |
| 35 | // FIXME: Figure out the multi-workspace situation | 35 | // FIXME: Figure out the multi-workspace situation |
| 36 | workspaces | 36 | workspaces |
| 37 | .iter() | 37 | .iter() |