apply new rustfmt.toml changes, fix some clippy lints

Signed-off-by: strawberry <strawberry@puppygock.gay>

src/database/map/contains.rs

@@ -29,7 +29,10 @@ where
 /// - harder errors will panic
 #[inline]
 #[implement(super::Map)]
-pub fn acontains<const MAX: usize, K>(self: &Arc<Self>, key: &K) -> impl Future<Output = bool> + Send + '_
+pub fn acontains<const MAX: usize, K>(
+	self: &Arc<Self>,
+	key: &K,
+) -> impl Future<Output = bool> + Send + '_
 where
 	K: Serialize + ?Sized + Debug,
 {
@@ -42,7 +45,11 @@ where
 /// - harder errors will panic
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, buf), fields(%self), level = "trace")]
-pub fn bcontains<K, B>(self: &Arc<Self>, key: &K, buf: &mut B) -> impl Future<Output = bool> + Send + '_
+pub fn bcontains<K, B>(
+	self: &Arc<Self>,
+	key: &K,
+	buf: &mut B,
+) -> impl Future<Output = bool> + Send + '_
 where
 	K: Serialize + ?Sized + Debug,
 	B: Write + AsRef<[u8]>,

src/database/map/count.rs

@@ -26,7 +26,10 @@ where
 /// - From is a raw
 #[implement(super::Map)]
 #[inline]
-pub fn raw_count_from<'a, P>(self: &'a Arc<Self>, from: &'a P) -> impl Future<Output = usize> + Send + 'a
+pub fn raw_count_from<'a, P>(
+	self: &'a Arc<Self>,
+	from: &'a P,
+) -> impl Future<Output = usize> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
 {
@@ -38,7 +41,10 @@ where
 /// - Prefix is structured key
 #[implement(super::Map)]
 #[inline]
-pub fn count_prefix<'a, P>(self: &'a Arc<Self>, prefix: &P) -> impl Future<Output = usize> + Send + 'a
+pub fn count_prefix<'a, P>(
+	self: &'a Arc<Self>,
+	prefix: &P,
+) -> impl Future<Output = usize> + Send + 'a
 where
 	P: Serialize + ?Sized + Debug + 'a,
 {
@@ -50,7 +56,10 @@ where
 /// - Prefix is raw
 #[implement(super::Map)]
 #[inline]
-pub fn raw_count_prefix<'a, P>(self: &'a Arc<Self>, prefix: &'a P) -> impl Future<Output = usize> + Send + 'a
+pub fn raw_count_prefix<'a, P>(
+	self: &'a Arc<Self>,
+	prefix: &'a P,
+) -> impl Future<Output = usize> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
 {

src/database/map/get.rs

@@ -31,7 +31,10 @@ where
 /// the query. The maximum size is supplied as const generic parameter.
 #[implement(super::Map)]
 #[inline]
-pub fn aqry<const MAX: usize, K>(self: &Arc<Self>, key: &K) -> impl Future<Output = Result<Handle<'_>>> + Send
+pub fn aqry<const MAX: usize, K>(
+	self: &Arc<Self>,
+	key: &K,
+) -> impl Future<Output = Result<Handle<'_>>> + Send
 where
 	K: Serialize + ?Sized + Debug,
 {
@@ -43,7 +46,11 @@ where
 /// asynchronously. The key is serialized into a user-supplied Writer.
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, buf), level = "trace")]
-pub fn bqry<K, B>(self: &Arc<Self>, key: &K, buf: &mut B) -> impl Future<Output = Result<Handle<'_>>> + Send
+pub fn bqry<K, B>(
+	self: &Arc<Self>,
+	key: &K,
+	buf: &mut B,
+) -> impl Future<Output = Result<Handle<'_>>> + Send
 where
 	K: Serialize + ?Sized + Debug,
 	B: Write + AsRef<[u8]>,
@@ -110,15 +117,15 @@ where
 
 	match res {
 		// cache hit; not found
-		Ok(None) => Err!(Request(NotFound("Not found in database"))),
+		| Ok(None) => Err!(Request(NotFound("Not found in database"))),
 
 		// cache hit; value found
-		Ok(Some(res)) => Ok(Some(Handle::from(res))),
+		| Ok(Some(res)) => Ok(Some(Handle::from(res))),
 
 		// cache miss; unknown
-		Err(e) if is_incomplete(&e) => Ok(None),
+		| Err(e) if is_incomplete(&e) => Ok(None),
 
 		// some other error occurred
-		Err(e) => or_else(e),
+		| Err(e) => or_else(e),
 	}
 }

src/database/map/get_batch.rs

@@ -9,7 +9,8 @@ use crate::{util::map_err, Handle};
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, keys), level = "trace")]
 pub fn aqry_batch<'b, 'a: 'b, const MAX: usize, I, K>(
-	self: &'a Arc<Self>, keys: I,
+	self: &'a Arc<Self>,
+	keys: I,
 ) -> impl Stream<Item = Result<Handle<'b>>> + Send + 'a
 where
 	I: Iterator<Item = &'b K> + Send + 'a,
@@ -22,7 +23,10 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, keys), level = "trace")]
-pub fn get_batch<'a, I, K>(self: &'a Arc<Self>, keys: I) -> impl Stream<Item = Result<Handle<'_>>> + Send + 'a
+pub fn get_batch<'a, I, K>(
+	self: &'a Arc<Self>,
+	keys: I,
+) -> impl Stream<Item = Result<Handle<'_>>> + Send + 'a
 where
 	I: Iterator<Item = &'a K> + Debug + Send + 'a,
 	K: AsRef<[u8]> + Debug + Send + ?Sized + Sync + 'a,
@@ -34,7 +38,10 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(name = "batch_blocking", level = "trace", skip_all)]
-pub(crate) fn get_batch_blocking<'a, I, K>(&self, keys: I) -> impl Iterator<Item = Result<Handle<'_>>> + Send
+pub(crate) fn get_batch_blocking<'a, I, K>(
+	&self,
+	keys: I,
+) -> impl Iterator<Item = Result<Handle<'_>>> + Send
 where
 	I: Iterator<Item = &'a K> + ExactSizeIterator + Debug + Send,
 	K: AsRef<[u8]> + Debug + Send + ?Sized + Sync + 'a,

src/database/map/keys_from.rs

@@ -11,7 +11,10 @@ use crate::{
 };
 
 #[implement(super::Map)]
-pub fn keys_from<'a, K, P>(self: &'a Arc<Self>, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+pub fn keys_from<'a, K, P>(
+	self: &'a Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -30,7 +33,10 @@ where
 }
 
 #[implement(super::Map)]
-pub fn keys_raw_from<'a, K, P>(self: &'a Arc<Self>, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+pub fn keys_raw_from<'a, K, P>(
+	self: &'a Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,

src/database/map/keys_prefix.rs

@@ -11,7 +11,10 @@ use serde::{Deserialize, Serialize};
 use crate::keyval::{result_deserialize_key, serialize_key, Key};
 
 #[implement(super::Map)]
-pub fn keys_prefix<'a, K, P>(self: &'a Arc<Self>, prefix: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+pub fn keys_prefix<'a, K, P>(
+	self: &'a Arc<Self>,
+	prefix: &P,
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -22,7 +25,10 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), level = "trace")]
-pub fn keys_prefix_raw<P>(self: &Arc<Self>, prefix: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn keys_prefix_raw<P>(
+	self: &Arc<Self>,
+	prefix: &P,
+) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -33,7 +39,8 @@ where
 
 #[implement(super::Map)]
 pub fn keys_raw_prefix<'a, K, P>(
-	self: &'a Arc<Self>, prefix: &'a P,
+	self: &'a Arc<Self>,
+	prefix: &'a P,
 ) -> impl Stream<Item = Result<Key<'_, K>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
@@ -44,7 +51,10 @@ where
 }
 
 #[implement(super::Map)]
-pub fn raw_keys_prefix<'a, P>(self: &'a Arc<Self>, prefix: &'a P) -> impl Stream<Item = Result<Key<'_>>> + Send + 'a
+pub fn raw_keys_prefix<'a, P>(
+	self: &'a Arc<Self>,
+	prefix: &'a P,
+) -> impl Stream<Item = Result<Key<'_>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
 {

src/database/map/rev_keys_from.rs

@@ -11,7 +11,10 @@ use crate::{
 };
 
 #[implement(super::Map)]
-pub fn rev_keys_from<'a, K, P>(self: &'a Arc<Self>, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+pub fn rev_keys_from<'a, K, P>(
+	self: &'a Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -22,7 +25,10 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), level = "trace")]
-pub fn rev_keys_from_raw<P>(self: &Arc<Self>, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn rev_keys_from_raw<P>(
+	self: &Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -31,7 +37,10 @@ where
 }
 
 #[implement(super::Map)]
-pub fn rev_keys_raw_from<'a, K, P>(self: &'a Arc<Self>, from: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+pub fn rev_keys_raw_from<'a, K, P>(
+	self: &'a Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
@@ -42,7 +51,10 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, from), fields(%self), level = "trace")]
-pub fn rev_raw_keys_from<P>(self: &Arc<Self>, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn rev_raw_keys_from<P>(
+	self: &Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
 {

src/database/map/rev_keys_prefix.rs

@@ -11,7 +11,10 @@ use serde::{Deserialize, Serialize};
 use crate::keyval::{result_deserialize_key, serialize_key, Key};
 
 #[implement(super::Map)]
-pub fn rev_keys_prefix<'a, K, P>(self: &'a Arc<Self>, prefix: &P) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+pub fn rev_keys_prefix<'a, K, P>(
+	self: &'a Arc<Self>,
+	prefix: &P,
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -22,7 +25,10 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), level = "trace")]
-pub fn rev_keys_prefix_raw<P>(self: &Arc<Self>, prefix: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn rev_keys_prefix_raw<P>(
+	self: &Arc<Self>,
+	prefix: &P,
+) -> impl Stream<Item = Result<Key<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -33,7 +39,8 @@ where
 
 #[implement(super::Map)]
 pub fn rev_keys_raw_prefix<'a, K, P>(
-	self: &'a Arc<Self>, prefix: &'a P,
+	self: &'a Arc<Self>,
+	prefix: &'a P,
 ) -> impl Stream<Item = Result<Key<'_, K>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
@@ -44,7 +51,10 @@ where
 }
 
 #[implement(super::Map)]
-pub fn rev_raw_keys_prefix<'a, P>(self: &'a Arc<Self>, prefix: &'a P) -> impl Stream<Item = Result<Key<'_>>> + Send + 'a
+pub fn rev_raw_keys_prefix<'a, P>(
+	self: &'a Arc<Self>,
+	prefix: &'a P,
+) -> impl Stream<Item = Result<Key<'_>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
 {

src/database/map/rev_stream_from.rs

@@ -19,7 +19,8 @@ use crate::{
 /// - Result is deserialized
 #[implement(super::Map)]
 pub fn rev_stream_from<'a, K, V, P>(
-	self: &'a Arc<Self>, from: &P,
+	self: &'a Arc<Self>,
+	from: &P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -36,7 +37,10 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), level = "trace")]
-pub fn rev_stream_from_raw<P>(self: &Arc<Self>, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn rev_stream_from_raw<P>(
+	self: &Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -50,7 +54,8 @@ where
 /// - Result is deserialized
 #[implement(super::Map)]
 pub fn rev_stream_raw_from<'a, K, V, P>(
-	self: &'a Arc<Self>, from: &P,
+	self: &'a Arc<Self>,
+	from: &P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
@@ -67,7 +72,10 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, from), fields(%self), level = "trace")]
-pub fn rev_raw_stream_from<P>(self: &Arc<Self>, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn rev_raw_stream_from<P>(
+	self: &Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
 {

src/database/map/rev_stream_prefix.rs

@@ -16,7 +16,8 @@ use crate::keyval::{result_deserialize, serialize_key, KeyVal};
 /// - Result is deserialized
 #[implement(super::Map)]
 pub fn rev_stream_prefix<'a, K, V, P>(
-	self: &'a Arc<Self>, prefix: &P,
+	self: &'a Arc<Self>,
+	prefix: &P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -33,7 +34,10 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), level = "trace")]
-pub fn rev_stream_prefix_raw<P>(self: &Arc<Self>, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn rev_stream_prefix_raw<P>(
+	self: &Arc<Self>,
+	prefix: &P,
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -48,7 +52,8 @@ where
 /// - Result is deserialized
 #[implement(super::Map)]
 pub fn rev_stream_raw_prefix<'a, K, V, P>(
-	self: &'a Arc<Self>, prefix: &'a P,
+	self: &'a Arc<Self>,
+	prefix: &'a P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
@@ -65,7 +70,8 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 pub fn rev_raw_stream_prefix<'a, P>(
-	self: &'a Arc<Self>, prefix: &'a P,
+	self: &'a Arc<Self>,
+	prefix: &'a P,
 ) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,

src/database/map/stream_from.rs

@@ -18,7 +18,10 @@ use crate::{
 /// - Query is serialized
 /// - Result is deserialized
 #[implement(super::Map)]
-pub fn stream_from<'a, K, V, P>(self: &'a Arc<Self>, from: &P) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+pub fn stream_from<'a, K, V, P>(
+	self: &'a Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -33,7 +36,10 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), level = "trace")]
-pub fn stream_from_raw<P>(self: &Arc<Self>, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn stream_from_raw<P>(
+	self: &Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -47,7 +53,8 @@ where
 /// - Result is deserialized
 #[implement(super::Map)]
 pub fn stream_raw_from<'a, K, V, P>(
-	self: &'a Arc<Self>, from: &P,
+	self: &'a Arc<Self>,
+	from: &P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
@@ -63,7 +70,10 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, from), fields(%self), level = "trace")]
-pub fn raw_stream_from<P>(self: &Arc<Self>, from: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn raw_stream_from<P>(
+	self: &Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
 {

src/database/map/stream_prefix.rs

@@ -16,7 +16,8 @@ use crate::keyval::{result_deserialize, serialize_key, KeyVal};
 /// - Result is deserialized
 #[implement(super::Map)]
 pub fn stream_prefix<'a, K, V, P>(
-	self: &'a Arc<Self>, prefix: &P,
+	self: &'a Arc<Self>,
+	prefix: &P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
@@ -33,7 +34,10 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), level = "trace")]
-pub fn stream_prefix_raw<P>(self: &Arc<Self>, prefix: &P) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+pub fn stream_prefix_raw<P>(
+	self: &Arc<Self>,
+	prefix: &P,
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -48,7 +52,8 @@ where
 /// - Result is deserialized
 #[implement(super::Map)]
 pub fn stream_raw_prefix<'a, K, V, P>(
-	self: &'a Arc<Self>, prefix: &'a P,
+	self: &'a Arc<Self>,
+	prefix: &'a P,
 ) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
@@ -65,7 +70,8 @@ where
 /// - Result is raw
 #[implement(super::Map)]
 pub fn raw_stream_prefix<'a, P>(
-	self: &'a Arc<Self>, prefix: &'a P,
+	self: &'a Arc<Self>,
+	prefix: &'a P,
 ) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + 'a
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,