Fix the compilation

Author: Kerollmops

roaring/src/bitmap/store/array_store/mod.rs

@@ -5,10 +5,10 @@ mod visitor;
 use crate::bitmap::store::array_store::visitor::{CardinalityCounter, VecWriter};
 use core::cmp::Ordering;
 use core::cmp::Ordering::*;
+use core::convert::identity;
 use core::fmt::{Display, Formatter};
 use core::mem::size_of;
 use core::ops::{BitAnd, BitAndAssign, BitOr, BitXor, RangeInclusive, Sub, SubAssign};
-use std::convert::identity;
 
 #[cfg(not(feature = "std"))]
 use alloc::vec::Vec;
@@ -127,30 +127,28 @@ impl ArrayStore {
 
     #[inline]
     pub fn insert(&mut self, index: u16) -> bool {
-        if cfg!(feature = "simd") {
-            vector::quad_search(&self.vec, index)
-        } else {
-            self.vec.binary_search(&index)
-        }
-        .map_err(|loc| self.vec.insert(loc, index))
-        .is_err()
+        #[cfg(feature = "simd")]
+        let result = vector::quad_search(&self.vec, index);
+        #[cfg(not(feature = "simd"))]
+        let result = self.vec.binary_search(&index);
+        result.map_err(|loc| self.vec.insert(loc, index)).is_err()
     }
 
     pub fn insert_range(&mut self, range: RangeInclusive<u16>) -> u64 {
         let start = *range.start();
         let end = *range.end();
 
         // Figure out the starting/ending position in the vec.
-        let pos_start = if cfg!(feature = "simd") {
-            vector::quad_search(&self.vec, start).unwrap_or_else(identity)
-        } else {
-            self.vec.binary_search(&start).unwrap_or_else(identity)
-        };
-        let pos_end_result = if cfg!(feature = "simd") {
-            vector::quad_search(&self.vec[pos_start..], end)
-        } else {
-            self.vec[pos_start..].binary_search(&end)
-        };
+        #[cfg(feature = "simd")]
+        let pos_start = vector::quad_search(&self.vec, start).unwrap_or_else(identity);
+        #[cfg(not(feature = "simd"))]
+        let pos_start = self.vec.binary_search(&start).unwrap_or_else(identity);
+
+        #[cfg(feature = "simd")]
+        let pos_end_result = vector::quad_search(&self.vec[pos_start..], end);
+        #[cfg(not(feature = "simd"))]
+        let pos_end_result = self.vec[pos_start..].binary_search(&end);
+
         let pos_end = match pos_end_result {
             Ok(x) => x + pos_start + 1,
             Err(x) => x + pos_start,
@@ -190,30 +188,29 @@ impl ArrayStore {
     }
 
     pub fn remove(&mut self, index: u16) -> bool {
-        if cfg!(feature = "simd") {
-            vector::quad_search(&self.vec, index)
-        } else {
-            self.vec.binary_search(&index)
-        }
-        .map(|loc| self.vec.remove(loc))
-        .is_ok()
+        #[cfg(feature = "simd")]
+        let result = vector::quad_search(&self.vec, index);
+        #[cfg(not(feature = "simd"))]
+        let result = self.vec.binary_search(&index);
+
+        result.map(|loc| self.vec.remove(loc)).is_ok()
     }
 
     pub fn remove_range(&mut self, range: RangeInclusive<u16>) -> u64 {
         let start = *range.start();
         let end = *range.end();
 
         // Figure out the starting/ending position in the vec.
-        let pos_start = if cfg!(feature = "simd") {
-            vector::quad_search(&self.vec, start).unwrap_or_else(identity)
-        } else {
-            self.vec.binary_search(&start).unwrap_or_else(identity)
-        };
-        let pos_end_result = if cfg!(feature = "simd") {
-            vector::quad_search(&self.vec[pos_start..], end)
-        } else {
-            self.vec[pos_start..].binary_search(&end)
-        };
+        #[cfg(feature = "simd")]
+        let pos_start = vector::quad_search(&self.vec, start).unwrap_or_else(identity);
+        #[cfg(not(feature = "simd"))]
+        let pos_start = self.vec.binary_search(&start).unwrap_or_else(identity);
+
+        #[cfg(feature = "simd")]
+        let pos_end_result = vector::quad_search(&self.vec[pos_start..], end);
+        #[cfg(not(feature = "simd"))]
+        let pos_end_result = self.vec[pos_start..].binary_search(&end);
+
         let pos_end = match pos_end_result {
             Ok(x) => x + pos_start + 1,
             Err(x) => x + pos_start,
@@ -233,11 +230,10 @@ impl ArrayStore {
     }
 
     pub fn contains(&self, index: u16) -> bool {
-        if cfg!(feature = "simd") {
-            vector::quad_contains(&self.vec, index)
-        } else {
-            self.vec.binary_search(&index).is_ok()
-        }
+        #[cfg(feature = "simd")]
+        return vector::quad_contains(&self.vec, index);
+        #[cfg(not(feature = "simd"))]
+        return self.vec.binary_search(&index).is_ok();
     }
 
     pub fn contains_range(&self, range: RangeInclusive<u16>) -> bool {
@@ -248,11 +244,12 @@ impl ArrayStore {
             return false;
         }
 
-        let start_i = match if cfg!(feature = "simd") {
-            vector::quad_search(&self.vec, start)
-        } else {
-            self.vec.binary_search(&start)
-        } {
+        #[cfg(feature = "simd")]
+        let result = vector::quad_search(&self.vec, start);
+        #[cfg(not(feature = "simd"))]
+        let result = self.vec.binary_search(&start);
+
+        let start_i = match result {
             Ok(i) => i,
             Err(_) => return false,
         };
@@ -341,11 +338,11 @@ impl ArrayStore {
     }
 
     pub fn rank(&self, index: u16) -> u64 {
-        let result = if cfg!(feature = "simd") {
-            vector::quad_search(&self.vec, index)
-        } else {
-            self.vec.binary_search(&index)
-        };
+        #[cfg(feature = "simd")]
+        let result = vector::quad_search(&self.vec, index);
+        #[cfg(not(feature = "simd"))]
+        let result = self.vec.binary_search(&index);
+
         match result {
             Ok(i) => i as u64 + 1,
             Err(i) => i as u64,