diff options
author | Aleksey Kladov <[email protected]> | 2021-04-05 18:49:00 +0100 |
---|---|---|
committer | Aleksey Kladov <[email protected]> | 2021-04-05 18:49:00 +0100 |
commit | 7099438e0c2f281629e11b63acfbcdefc22fef76 (patch) | |
tree | 3ef41a06b6874a57f26d04eb9e2533088af04147 /crates/rust-analyzer/src/op_queue.rs | |
parent | fab1c066464022613729a6d714dc83b7d698ece5 (diff) |
internal: prepare to store OpQueue results in the queue itself
Diffstat (limited to 'crates/rust-analyzer/src/op_queue.rs')
-rw-r--r-- | crates/rust-analyzer/src/op_queue.rs | 26 |
1 files changed, 17 insertions, 9 deletions
diff --git a/crates/rust-analyzer/src/op_queue.rs b/crates/rust-analyzer/src/op_queue.rs index 761b9ad39..f71b718bc 100644 --- a/crates/rust-analyzer/src/op_queue.rs +++ b/crates/rust-analyzer/src/op_queue.rs | |||
@@ -1,29 +1,37 @@ | |||
1 | //! Bookkeeping to make sure only one long-running operation is executed. | 1 | //! Bookkeeping to make sure only one long-running operation is being executed |
2 | //! at a time. | ||
2 | 3 | ||
3 | pub(crate) struct OpQueue<D> { | 4 | pub(crate) struct OpQueue<Args, Output> { |
4 | op_scheduled: Option<D>, | 5 | op_scheduled: Option<Args>, |
5 | op_in_progress: bool, | 6 | op_in_progress: bool, |
7 | last_op_result: Output, | ||
6 | } | 8 | } |
7 | 9 | ||
8 | impl<D> Default for OpQueue<D> { | 10 | impl<Args, Output: Default> Default for OpQueue<Args, Output> { |
9 | fn default() -> Self { | 11 | fn default() -> Self { |
10 | Self { op_scheduled: None, op_in_progress: false } | 12 | Self { op_scheduled: None, op_in_progress: false, last_op_result: Default::default() } |
11 | } | 13 | } |
12 | } | 14 | } |
13 | 15 | ||
14 | impl<D> OpQueue<D> { | 16 | impl<Args, Output> OpQueue<Args, Output> { |
15 | pub(crate) fn request_op(&mut self, data: D) { | 17 | pub(crate) fn request_op(&mut self, data: Args) { |
16 | self.op_scheduled = Some(data); | 18 | self.op_scheduled = Some(data); |
17 | } | 19 | } |
18 | pub(crate) fn should_start_op(&mut self) -> Option<D> { | 20 | pub(crate) fn should_start_op(&mut self) -> Option<Args> { |
19 | if self.op_in_progress { | 21 | if self.op_in_progress { |
20 | return None; | 22 | return None; |
21 | } | 23 | } |
22 | self.op_in_progress = self.op_scheduled.is_some(); | 24 | self.op_in_progress = self.op_scheduled.is_some(); |
23 | self.op_scheduled.take() | 25 | self.op_scheduled.take() |
24 | } | 26 | } |
25 | pub(crate) fn op_completed(&mut self) { | 27 | pub(crate) fn op_completed(&mut self, result: Output) { |
26 | assert!(self.op_in_progress); | 28 | assert!(self.op_in_progress); |
27 | self.op_in_progress = false; | 29 | self.op_in_progress = false; |
30 | self.last_op_result = result; | ||
31 | } | ||
32 | |||
33 | #[allow(unused)] | ||
34 | pub(crate) fn last_op_result(&self) -> &Output { | ||
35 | &self.last_op_result | ||
28 | } | 36 | } |
29 | } | 37 | } |