diff options
Diffstat (limited to 'crates/ra_lsp_server')
-rw-r--r-- | crates/ra_lsp_server/src/main_loop/mod.rs | 2 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/path_map.rs | 5 | ||||
-rw-r--r-- | crates/ra_lsp_server/src/server_world.rs | 10 |
3 files changed, 3 insertions, 14 deletions
diff --git a/crates/ra_lsp_server/src/main_loop/mod.rs b/crates/ra_lsp_server/src/main_loop/mod.rs index c568706bd..1eb147539 100644 --- a/crates/ra_lsp_server/src/main_loop/mod.rs +++ b/crates/ra_lsp_server/src/main_loop/mod.rs | |||
@@ -61,7 +61,7 @@ pub fn main_loop( | |||
61 | let (ws_worker, ws_watcher) = workspace_loader(); | 61 | let (ws_worker, ws_watcher) = workspace_loader(); |
62 | 62 | ||
63 | info!("server initialized, serving requests"); | 63 | info!("server initialized, serving requests"); |
64 | let mut state = ServerWorldState::new(); | 64 | let mut state = ServerWorldState::default(); |
65 | 65 | ||
66 | let mut pending_requests = FxHashSet::default(); | 66 | let mut pending_requests = FxHashSet::default(); |
67 | let mut subs = Subscriptions::new(); | 67 | let mut subs = Subscriptions::new(); |
diff --git a/crates/ra_lsp_server/src/path_map.rs b/crates/ra_lsp_server/src/path_map.rs index dd09fa10a..87eabf9be 100644 --- a/crates/ra_lsp_server/src/path_map.rs +++ b/crates/ra_lsp_server/src/path_map.rs | |||
@@ -28,9 +28,6 @@ impl fmt::Debug for PathMap { | |||
28 | } | 28 | } |
29 | 29 | ||
30 | impl PathMap { | 30 | impl PathMap { |
31 | pub fn new() -> PathMap { | ||
32 | Default::default() | ||
33 | } | ||
34 | pub fn get_or_insert(&mut self, path: PathBuf, root: Root) -> (bool, FileId) { | 31 | pub fn get_or_insert(&mut self, path: PathBuf, root: Root) -> (bool, FileId) { |
35 | let mut inserted = false; | 32 | let mut inserted = false; |
36 | let file_id = self | 33 | let file_id = self |
@@ -117,7 +114,7 @@ mod test { | |||
117 | 114 | ||
118 | #[test] | 115 | #[test] |
119 | fn test_resolve() { | 116 | fn test_resolve() { |
120 | let mut m = PathMap::new(); | 117 | let mut m = PathMap::default(); |
121 | let (_, id1) = m.get_or_insert(PathBuf::from("/foo"), Root::Workspace); | 118 | let (_, id1) = m.get_or_insert(PathBuf::from("/foo"), Root::Workspace); |
122 | let (_, id2) = m.get_or_insert(PathBuf::from("/foo/bar.rs"), Root::Workspace); | 119 | let (_, id2) = m.get_or_insert(PathBuf::from("/foo/bar.rs"), Root::Workspace); |
123 | assert_eq!(m.resolve(id1, &RelativePath::new("bar.rs")), Some(id2),) | 120 | assert_eq!(m.resolve(id1, &RelativePath::new("bar.rs")), Some(id2),) |
diff --git a/crates/ra_lsp_server/src/server_world.rs b/crates/ra_lsp_server/src/server_world.rs index 3e76d2527..3e7670fcc 100644 --- a/crates/ra_lsp_server/src/server_world.rs +++ b/crates/ra_lsp_server/src/server_world.rs | |||
@@ -17,7 +17,7 @@ use crate::{ | |||
17 | Result, | 17 | Result, |
18 | }; | 18 | }; |
19 | 19 | ||
20 | #[derive(Debug)] | 20 | #[derive(Debug, Default)] |
21 | pub struct ServerWorldState { | 21 | pub struct ServerWorldState { |
22 | pub workspaces: Arc<Vec<CargoWorkspace>>, | 22 | pub workspaces: Arc<Vec<CargoWorkspace>>, |
23 | pub analysis_host: AnalysisHost, | 23 | pub analysis_host: AnalysisHost, |
@@ -32,14 +32,6 @@ pub struct ServerWorld { | |||
32 | } | 32 | } |
33 | 33 | ||
34 | impl ServerWorldState { | 34 | impl ServerWorldState { |
35 | pub fn new() -> ServerWorldState { | ||
36 | ServerWorldState { | ||
37 | workspaces: Arc::new(Vec::new()), | ||
38 | analysis_host: AnalysisHost::new(), | ||
39 | path_map: PathMap::new(), | ||
40 | mem_map: FxHashMap::default(), | ||
41 | } | ||
42 | } | ||
43 | pub fn apply_fs_changes(&mut self, events: Vec<FileEvent>) { | 35 | pub fn apply_fs_changes(&mut self, events: Vec<FileEvent>) { |
44 | let mut change = AnalysisChange::new(); | 36 | let mut change = AnalysisChange::new(); |
45 | let mut inserted = false; | 37 | let mut inserted = false; |