From 4835a3d8323827e8c9b79dfd064c7f42cd8b086e Mon Sep 17 00:00:00 2001 From: Ziyang Hu Date: Fri, 22 Apr 2022 01:12:01 +0800 Subject: [PATCH] nice way of writing the comparison --- src/lib.rs | 2 +- src/relation/key_order.rs | 19 ++++--------------- 2 files changed, 5 insertions(+), 16 deletions(-) diff --git a/src/lib.rs b/src/lib.rs index 4f1c9c06..9fb953fb 100644 --- a/src/lib.rs +++ b/src/lib.rs @@ -18,7 +18,7 @@ mod tests { #[test] fn import() { use cozorocks::*; - let _o = Options::default(); + let _o = OptionsPtr::default(); println!("Hello"); } } \ No newline at end of file diff --git a/src/relation/key_order.rs b/src/relation/key_order.rs index 47b58fe4..91580e7d 100644 --- a/src/relation/key_order.rs +++ b/src/relation/key_order.rs @@ -9,21 +9,10 @@ pub fn compare(a: &[u8], b: &[u8]) -> i8 { Ordering::Greater => return 1, Ordering::Equal => {} } - let mut ia = ta.iter(); - let mut ib = tb.iter(); - loop { - match (ia.next(), ib.next()) { - (None, None) => return 0, - (None, Some(_)) => return -1, - (Some(_), None) => return 1, - (Some(va), Some(vb)) => { - match va.cmp(&vb) { - Ordering::Less => return -1, - Ordering::Greater => return 1, - Ordering::Equal => {} - } - } - } + match ta.iter().cmp(tb.iter()) { + Ordering::Less => -1, + Ordering::Equal => 0, + Ordering::Greater => 1 } }