Clippy feedback, more restrictive imports in pagecache

Author: spacejam

src/debug_delay.rs

@@ -45,9 +45,9 @@ pub fn debug_delay() {
 
     let global_delays = GLOBAL_DELAYS.fetch_add(1, Relaxed);
     let local_delays = LOCAL_DELAYS.with(|ld| {
-        let mut ld = ld.borrow_mut();
-        let old = *ld;
-        *ld = std::cmp::max(global_delays + 1, *ld + 1);
+        let old = *ld.borrow();
+        let new = (global_delays + 1).max(old + 1);
+        *ld.borrow_mut() = new;
         old
     });
 

src/ebr/internal.rs

@@ -102,7 +102,7 @@ impl Bag {
 
     /// Seals the bag with the given epoch.
     fn seal(self, epoch: Epoch) -> SealedBag {
-        SealedBag { epoch, bag: self }
+        SealedBag { epoch, _bag: self }
     }
 }
 
@@ -217,7 +217,8 @@ const fn no_op_func() {}
 #[derive(Debug)]
 struct SealedBag {
     epoch: Epoch,
-    bag: Bag,
+    // exists solely to be dropped
+    _bag: Bag,
 }
 
 /// It is safe to share `SealedBag` because `is_expired` only inspects the epoch.

src/pagecache/mod.rs

@@ -123,7 +123,7 @@ pub enum MessageKind {
 }
 
 impl MessageKind {
-    pub(crate) const fn into(self) -> u8 {
+    pub(in crate::pagecache) const fn into(self) -> u8 {
         self as u8
     }
 }
@@ -225,16 +225,16 @@ fn bump_atomic_lsn(atomic_lsn: &AtomicLsn, to: Lsn) {
 
 use std::convert::{TryFrom, TryInto};
 
-pub(crate) const fn lsn_to_arr(number: Lsn) -> [u8; 8] {
+pub(in crate::pagecache) const fn lsn_to_arr(number: Lsn) -> [u8; 8] {
     number.to_le_bytes()
 }
 
 #[inline]
-pub(crate) fn arr_to_lsn(arr: &[u8]) -> Lsn {
+pub(in crate::pagecache) fn arr_to_lsn(arr: &[u8]) -> Lsn {
     Lsn::from_le_bytes(arr.try_into().unwrap())
 }
 
-pub(crate) const fn u64_to_arr(number: u64) -> [u8; 8] {
+pub(in crate::pagecache) const fn u64_to_arr(number: u64) -> [u8; 8] {
     number.to_le_bytes()
 }
 
@@ -249,7 +249,7 @@ pub(crate) const fn u32_to_arr(number: u32) -> [u8; 4] {
 
 #[allow(clippy::needless_pass_by_value)]
 #[allow(clippy::needless_return)]
-pub(crate) fn decompress(in_buf: Vec<u8>) -> Vec<u8> {
+pub(in crate::pagecache) fn decompress(in_buf: Vec<u8>) -> Vec<u8> {
     #[cfg(feature = "compression")]
     {
         use zstd::stream::decode_all;
@@ -295,8 +295,8 @@ impl<'g> Deref for MetaView<'g> {
 
 #[derive(Debug, Clone, Copy)]
 pub struct PageView<'g> {
-    pub(crate) read: Shared<'g, Page>,
-    pub(crate) entry: &'g Atomic<Page>,
+    pub(in crate::pagecache) read: Shared<'g, Page>,
+    pub(in crate::pagecache) entry: &'g Atomic<Page>,
 }
 
 impl<'g> Deref for PageView<'g> {
@@ -327,7 +327,7 @@ impl quickcheck::Arbitrary for CacheInfo {
 /// of which a page consists.
 #[derive(Clone, Debug)]
 #[cfg_attr(feature = "testing", derive(PartialEq))]
-pub(crate) enum Update {
+pub(in crate::pagecache) enum Update {
     Link(Link),
     Node(Node),
     Free,
@@ -410,7 +410,7 @@ pub struct Page {
 }
 
 impl Page {
-    pub(crate) fn rss(&self) -> Option<u64> {
+    pub(in crate::pagecache) fn rss(&self) -> Option<u64> {
         match &self.update {
             Some(Update::Node(ref node)) => Some(node.rss()),
             _ => None,
@@ -1670,7 +1670,7 @@ impl PageCacheInner {
     }
 
     /// Retrieve the current persisted IDGEN value
-    pub(crate) fn get_idgen<'g>(
+    pub(in crate::pagecache) fn get_idgen<'g>(
         &self,
         guard: &'g Guard,
     ) -> (PageView<'g>, u64) {

src/pagecache/snapshot.rs

@@ -477,7 +477,7 @@ fn advance_snapshot(
 pub fn read_snapshot_or_default(config: &RunningConfig) -> Result<Snapshot> {
     // NB we want to error out if the read snapshot was corrupted.
     // We only use a default Snapshot when there is no snapshot found.
-    let last_snap = read_snapshot(config)?.unwrap_or_else(Snapshot::default);
+    let last_snap = read_snapshot(config)?.unwrap_or_default();
 
     let log_iter =
         raw_segment_iter_from(last_snap.stable_lsn.unwrap_or(0), config)?;

src/serialization.rs

@@ -433,7 +433,7 @@ fn shift_i64_opt(value_opt: &Option<i64>) -> i64 {
 
 const fn unshift_i64_opt(value: i64) -> Option<i64> {
     if value == 0 {
-        return None
+        return None;
     }
     let subtract = value > 0;
     Some(value - subtract as i64)
@@ -686,7 +686,7 @@ where
         if self.bound == 0 || self.buf.is_empty() {
             return None;
         }
-        let item_res = T::deserialize(&mut self.buf);
+        let item_res = T::deserialize(self.buf);
         self.bound -= 1;
         if item_res.is_err() {
             self.bound = 0;

src/transaction.rs

@@ -550,10 +550,7 @@ impl<E> Transactional<E> for [Tree] {
         }
 
         Ok(TransactionalTrees {
-            inner: self
-                .iter()
-                .map(|t| TransactionalTree::from_tree(t))
-                .collect(),
+            inner: self.iter().map(TransactionalTree::from_tree).collect(),
         })
     }