Fix clippy::if_not_else warnings

Author: pvdrz

src/histbuf.rs

@@ -463,10 +463,10 @@ impl<T, S: HistBufStorage<T> + ?Sized> HistoryBufferInner<T, S> {
     pub fn as_slices(&self) -> (&[T], &[T]) {
         let buffer = self.as_slice();
 
-        if !self.filled {
-            (buffer, &[])
-        } else {
+        if self.filled {
             (&buffer[self.write_at..], &buffer[..self.write_at])
+        } else {
+            (buffer, &[])
         }
     }
 

src/lib.rs

@@ -147,7 +147,8 @@
     clippy::option_if_let_else,
     clippy::ptr_as_ptr,
     clippy::doc_markdown,
-    clippy::semicolon_if_nothing_returned
+    clippy::semicolon_if_nothing_returned,
+    clippy::if_not_else
 )]
 
 pub use binary_heap::BinaryHeap;

src/sorted_linked_list.rs

@@ -362,12 +362,7 @@ where
             // Check if we need to replace head
             if self
                 .read_data_in_node_at(head)
-                .cmp(self.read_data_in_node_at(new))
-                != K::ordering()
-            {
-                self.node_at_mut(new).next = self.head;
-                self.head = Idx::new_unchecked(new);
-            } else {
+                .cmp(self.read_data_in_node_at(new)) == K::ordering() {
                 // It's not head, search the list for the correct placement
                 let mut current = head;
 
@@ -385,6 +380,9 @@ where
 
                 self.node_at_mut(new).next = self.node_at(current).next;
                 self.node_at_mut(current).next = Idx::new_unchecked(new);
+            } else {
+                self.node_at_mut(new).next = self.head;
+                self.head = Idx::new_unchecked(new);
             }
         } else {
             self.node_at_mut(new).next = self.head;
@@ -416,11 +414,11 @@ where
     /// assert_eq!(ll.push(4), Err(4));
     /// ```
     pub fn push(&mut self, value: T) -> Result<(), T> {
-        if !self.is_full() {
+        if self.is_full() {
+            Err(value)
+        } else {
             unsafe { self.push_unchecked(value) }
             Ok(())
-        } else {
-            Err(value)
         }
     }
 
@@ -571,10 +569,10 @@ where
     /// assert_eq!(ll.pop(), None);
     /// ```
     pub fn pop(&mut self) -> Option<T> {
-        if !self.is_empty() {
-            Some(unsafe { self.pop_unchecked() })
-        } else {
+        if self.is_empty() {
             None
+        } else {
+            Some(unsafe { self.pop_unchecked() })
         }
     }
 

src/spsc.rs

@@ -262,11 +262,11 @@ impl<T, S: Storage> QueueInner<T, S> {
     /// assert_eq!(None, consumer.peek());
     /// ```
     pub fn peek(&self) -> Option<&T> {
-        if !self.is_empty() {
+        if self.is_empty() {
+            None
+        } else {
             let head = self.head.load(Ordering::Relaxed);
             Some(unsafe { &*(self.buffer.borrow().get_unchecked(head).get() as *const T) })
-        } else {
-            None
         }
     }
 
@@ -277,13 +277,13 @@ impl<T, S: Storage> QueueInner<T, S> {
         let current_tail = self.tail.load(Ordering::Relaxed);
         let next_tail = self.increment(current_tail);
 
-        if next_tail != self.head.load(Ordering::Acquire) {
+        if next_tail == self.head.load(Ordering::Acquire) {
+            Err(val)
+        } else {
             (self.buffer.borrow().get_unchecked(current_tail).get()).write(MaybeUninit::new(val));
             self.tail.store(next_tail, Ordering::Release);
 
             Ok(())
-        } else {
-            Err(val)
         }
     }