diff options
author | Aleksey Kladov <[email protected]> | 2018-08-29 16:03:14 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2018-08-29 16:03:14 +0100 |
commit | 8abf5363433e977c5393bb569e2a5d559cb0a602 (patch) | |
tree | 8bb7bc3097cb9e22af9e3be8605cb4745c2fae5f /crates/server/src/server_world.rs | |
parent | 2007ccfcfe0bf01c934589dd3c87fda83b06b272 (diff) |
Grand refactoring
Diffstat (limited to 'crates/server/src/server_world.rs')
-rw-r--r-- | crates/server/src/server_world.rs | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/crates/server/src/server_world.rs b/crates/server/src/server_world.rs index 1982e727f..6c85914ba 100644 --- a/crates/server/src/server_world.rs +++ b/crates/server/src/server_world.rs | |||
@@ -5,7 +5,7 @@ use std::{ | |||
5 | }; | 5 | }; |
6 | 6 | ||
7 | use languageserver_types::Url; | 7 | use languageserver_types::Url; |
8 | use libanalysis::{FileId, WorldState, World}; | 8 | use libanalysis::{FileId, WorldState, Analysis}; |
9 | 9 | ||
10 | use { | 10 | use { |
11 | Result, | 11 | Result, |
@@ -22,7 +22,7 @@ pub struct ServerWorldState { | |||
22 | 22 | ||
23 | #[derive(Clone)] | 23 | #[derive(Clone)] |
24 | pub struct ServerWorld { | 24 | pub struct ServerWorld { |
25 | pub analysis: World, | 25 | pub analysis: Analysis, |
26 | pub path_map: PathMap, | 26 | pub path_map: PathMap, |
27 | } | 27 | } |
28 | 28 | ||
@@ -91,14 +91,14 @@ impl ServerWorldState { | |||
91 | 91 | ||
92 | pub fn snapshot(&self) -> ServerWorld { | 92 | pub fn snapshot(&self) -> ServerWorld { |
93 | ServerWorld { | 93 | ServerWorld { |
94 | analysis: self.analysis.snapshot(self.path_map.clone()), | 94 | analysis: self.analysis.analysis(self.path_map.clone()), |
95 | path_map: self.path_map.clone() | 95 | path_map: self.path_map.clone() |
96 | } | 96 | } |
97 | } | 97 | } |
98 | } | 98 | } |
99 | 99 | ||
100 | impl ServerWorld { | 100 | impl ServerWorld { |
101 | pub fn analysis(&self) -> &World { | 101 | pub fn analysis(&self) -> &Analysis { |
102 | &self.analysis | 102 | &self.analysis |
103 | } | 103 | } |
104 | 104 | ||