From 7f99c9053951e08b0f640cac7868a6edc07f74aa Mon Sep 17 00:00:00 2001 From: Greg Fitzgerald Date: Fri, 7 Sep 2018 09:56:51 -0600 Subject: [PATCH] Simplify using early return and Result::ok() --- src/window.rs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/window.rs b/src/window.rs index ed9a476d92..c3e0591137 100644 --- a/src/window.rs +++ b/src/window.rs @@ -60,13 +60,13 @@ fn find_next_missing( recycler.recycle(blob, "find_next_missing"); } } - if slot.data.is_none() { - let val = crdt.read().unwrap().window_index_request(pix as u64); - if let Ok((to, req)) = val { - return Some((to, req)); - } + + if slot.data.is_some() { + return None; } - None + + let val = crdt.read().unwrap().window_index_request(pix as u64); + val.ok() }) .collect() }