From 6368008c0d32ba2ae3f864f99dc584955753d8e3 Mon Sep 17 00:00:00 2001 From: Xiangpeng Hao Date: Wed, 17 Jan 2024 21:54:13 -0600 Subject: [PATCH] make clippy happy --- src/base_node.rs | 2 +- src/error.rs | 4 ++-- src/lock.rs | 8 ++++---- src/tree.rs | 4 ++-- 4 files changed, 9 insertions(+), 9 deletions(-) diff --git a/src/base_node.rs b/src/base_node.rs index e200f6d..5d37520 100644 --- a/src/base_node.rs +++ b/src/base_node.rs @@ -243,7 +243,7 @@ impl BaseNode { // crate::utils::fail_point(ArtError::Locked(version))?; if Self::is_locked(version) || Self::is_obsolete(version) { - return Err(ArtError::Locked(version)); + return Err(ArtError::Locked); } Ok(ReadGuard::new(version, self)) diff --git a/src/error.rs b/src/error.rs index 90b2b14..be20fef 100644 --- a/src/error.rs +++ b/src/error.rs @@ -3,8 +3,8 @@ use std::fmt::{self, Debug, Display, Formatter}; #[derive(Debug)] pub(crate) enum ArtError { - VersionNotMatch(usize), - Locked(usize), + VersionNotMatch, + Locked, Oom, } diff --git a/src/lock.rs b/src/lock.rs index 357a68e..5c07297 100644 --- a/src/lock.rs +++ b/src/lock.rs @@ -38,7 +38,7 @@ impl<'a, T: Node> ConcreteReadGuard<'a, T> { Ok(_) => Ok(ConcreteWriteGuard { node: unsafe { &mut *self.node.get() }, }), - Err(v) => Err((self, ArtError::VersionNotMatch(v))), + Err(_v) => Err((self, ArtError::VersionNotMatch)), } } } @@ -93,12 +93,12 @@ impl<'a> ReadGuard<'a> { .load(Ordering::Acquire); #[cfg(test)] - crate::utils::fail_point(ArtError::VersionNotMatch(v))?; + crate::utils::fail_point(ArtError::VersionNotMatch)?; if v == self.version { Ok(v) } else { - Err(ArtError::VersionNotMatch(v)) + Err(ArtError::VersionNotMatch) } } @@ -142,7 +142,7 @@ impl<'a> ReadGuard<'a> { Ok(_) => Ok(WriteGuard { node: unsafe { &mut *self.node.get() }, }), - Err(v) => Err((self, ArtError::VersionNotMatch(v))), + Err(_v) => Err((self, ArtError::VersionNotMatch)), } } } diff --git a/src/tree.rs b/src/tree.rs index 7abdf16..1006db0 100644 --- a/src/tree.rs +++ b/src/tree.rs @@ -265,7 +265,7 @@ impl RawTree { match self.insert_inner(&k, &mut |_| tid, guard) { Ok(v) => return Ok(v), Err(e) => match e { - ArtError::Locked(_) | ArtError::VersionNotMatch(_) => { + ArtError::Locked | ArtError::VersionNotMatch => { backoff.spin(); continue; } @@ -290,7 +290,7 @@ impl RawTree { match self.insert_inner(&k, insert_func, guard) { Ok(v) => return Ok(v), Err(e) => match e { - ArtError::Locked(_) | ArtError::VersionNotMatch(_) => { + ArtError::Locked | ArtError::VersionNotMatch => { backoff.spin(); continue; }