run cargo fix for rust 2024 changes and rustfmt

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

src/database/map/compact.rs

@@ -1,4 +1,4 @@
-use conduwuit::{implement, Err, Result};
+use conduwuit::{Err, Result, implement};
 use rocksdb::{BottommostLevelCompaction, CompactOptions};
 
 use crate::keyval::KeyBuf;

src/database/map/contains.rs

@@ -1,10 +1,10 @@
 use std::{convert::AsRef, fmt::Debug, future::Future, io::Write, sync::Arc};
 
 use conduwuit::{
+	Result,
 	arrayvec::ArrayVec,
 	err, implement,
 	utils::{future::TryExtExt, result::FlatOk},
-	Result,
 };
 use futures::FutureExt;
 use serde::Serialize;
@@ -16,7 +16,10 @@ use crate::{keyval::KeyBuf, ser};
 /// - harder errors may not be reported
 #[inline]
 #[implement(super::Map)]
-pub fn contains<K>(self: &Arc<Self>, key: &K) -> impl Future<Output = bool> + Send + '_
+pub fn contains<K>(
+	self: &Arc<Self>,
+	key: &K,
+) -> impl Future<Output = bool> + Send + '_ + use<'_, K>
 where
 	K: Serialize + ?Sized + Debug,
 {
@@ -32,7 +35,7 @@ where
 pub fn acontains<const MAX: usize, K>(
 	self: &Arc<Self>,
 	key: &K,
-) -> impl Future<Output = bool> + Send + '_
+) -> impl Future<Output = bool> + Send + '_ + use<'_, MAX, K>
 where
 	K: Serialize + ?Sized + Debug,
 {
@@ -49,7 +52,7 @@ pub fn bcontains<K, B>(
 	self: &Arc<Self>,
 	key: &K,
 	buf: &mut B,
-) -> impl Future<Output = bool> + Send + '_
+) -> impl Future<Output = bool> + Send + '_ + use<'_, K, B>
 where
 	K: Serialize + ?Sized + Debug,
 	B: Write + AsRef<[u8]>,
@@ -62,7 +65,10 @@ where
 /// - key is raw
 #[inline]
 #[implement(super::Map)]
-pub fn exists<'a, K>(self: &'a Arc<Self>, key: &K) -> impl Future<Output = Result> + Send + 'a
+pub fn exists<'a, K>(
+	self: &'a Arc<Self>,
+	key: &K,
+) -> impl Future<Output = Result> + Send + 'a + use<'a, K>
 where
 	K: AsRef<[u8]> + ?Sized + Debug + 'a,
 {

src/database/map/count.rs

@@ -16,7 +16,10 @@ pub fn count(self: &Arc<Self>) -> impl Future<Output = usize> + Send + '_ {
 /// - From is a structured key
 #[implement(super::Map)]
 #[inline]
-pub fn count_from<'a, P>(self: &'a Arc<Self>, from: &P) -> impl Future<Output = usize> + Send + 'a
+pub fn count_from<'a, P>(
+	self: &'a Arc<Self>,
+	from: &P,
+) -> impl Future<Output = usize> + Send + 'a + use<'a, P>
 where
 	P: Serialize + ?Sized + Debug + 'a,
 {
@@ -46,7 +49,7 @@ where
 pub fn count_prefix<'a, P>(
 	self: &'a Arc<Self>,
 	prefix: &P,
-) -> impl Future<Output = usize> + Send + 'a
+) -> impl Future<Output = usize> + Send + 'a + use<'a, P>
 where
 	P: Serialize + ?Sized + Debug + 'a,
 {

src/database/map/get.rs

@@ -1,20 +1,23 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{err, implement, utils::result::MapExpect, Err, Result};
-use futures::{future::ready, Future, FutureExt, TryFutureExt};
+use conduwuit::{Err, Result, err, implement, utils::result::MapExpect};
+use futures::{Future, FutureExt, TryFutureExt, future::ready};
 use rocksdb::{DBPinnableSlice, ReadOptions};
 use tokio::task;
 
 use crate::{
-	util::{is_incomplete, map_err, or_else},
 	Handle,
+	util::{is_incomplete, map_err, or_else},
 };
 
 /// Fetch a value from the database into cache, returning a reference-handle
 /// asynchronously. The key is referenced directly to perform the query.
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, key), fields(%self), level = "trace")]
-pub fn get<K>(self: &Arc<Self>, key: &K) -> impl Future<Output = Result<Handle<'_>>> + Send
+pub fn get<K>(
+	self: &Arc<Self>,
+	key: &K,
+) -> impl Future<Output = Result<Handle<'_>>> + Send + use<'_, K>
 where
 	K: AsRef<[u8]> + Debug + ?Sized,
 {

src/database/map/get_batch.rs

@@ -1,12 +1,11 @@
 use std::{convert::AsRef, sync::Arc};
 
 use conduwuit::{
-	implement,
+	Result, implement,
 	utils::{
-		stream::{automatic_amplification, automatic_width, WidebandExt},
 		IterStream,
+		stream::{WidebandExt, automatic_amplification, automatic_width},
 	},
-	Result,
 };
 use futures::{Stream, StreamExt, TryStreamExt};
 use rocksdb::{DBPinnableSlice, ReadOptions};
@@ -64,7 +63,7 @@ where
 pub(crate) fn get_batch_cached<'a, I, K>(
 	&self,
 	keys: I,
-) -> impl Iterator<Item = Result<Option<Handle<'_>>>> + Send
+) -> impl Iterator<Item = Result<Option<Handle<'_>>>> + Send + use<'_, I, K>
 where
 	I: Iterator<Item = &'a K> + ExactSizeIterator + Send,
 	K: AsRef<[u8]> + Send + ?Sized + Sync + 'a,
@@ -78,7 +77,7 @@ where
 pub(crate) fn get_batch_blocking<'a, I, K>(
 	&self,
 	keys: I,
-) -> impl Iterator<Item = Result<Handle<'_>>> + Send
+) -> impl Iterator<Item = Result<Handle<'_>>> + Send + use<'_, I, K>
 where
 	I: Iterator<Item = &'a K> + ExactSizeIterator + Send,
 	K: AsRef<[u8]> + Send + ?Sized + Sync + 'a,
@@ -92,7 +91,7 @@ fn get_batch_blocking_opts<'a, I, K>(
 	&self,
 	keys: I,
 	read_options: &ReadOptions,
-) -> impl Iterator<Item = Result<Option<DBPinnableSlice<'_>>, rocksdb::Error>> + Send
+) -> impl Iterator<Item = Result<Option<DBPinnableSlice<'_>>, rocksdb::Error>> + Send + use<'_, I, K>
 where
 	I: Iterator<Item = &'a K> + ExactSizeIterator + Send,
 	K: AsRef<[u8]> + Send + ?Sized + Sync + 'a,

src/database/map/keys.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use rocksdb::Direction;
 use serde::Deserialize;

src/database/map/keys_from.rs

@@ -1,13 +1,13 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use rocksdb::Direction;
 use serde::{Deserialize, Serialize};
 
 use super::stream_from::is_cached;
 use crate::{
-	keyval::{result_deserialize_key, serialize_key, Key},
+	keyval::{Key, result_deserialize_key, serialize_key},
 	stream,
 };
 
@@ -15,7 +15,7 @@ use crate::{
 pub fn keys_from<'a, K, P>(
 	self: &'a Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send + use<'a, K, P>
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -25,7 +25,10 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self), level = "trace")]
-pub fn keys_from_raw<P>(self: &Arc<Self>, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn keys_from_raw<P>(
+	self: &Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<Key<'_>>> + Send + use<'_, P>
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -37,7 +40,7 @@ where
 pub fn keys_raw_from<'a, K, P>(
 	self: &'a Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send + use<'a, K, P>
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
@@ -47,7 +50,10 @@ where
 
 #[implement(super::Map)]
 #[tracing::instrument(skip(self, from), fields(%self), level = "trace")]
-pub fn raw_keys_from<P>(self: &Arc<Self>, from: &P) -> impl Stream<Item = Result<Key<'_>>> + Send
+pub fn raw_keys_from<P>(
+	self: &Arc<Self>,
+	from: &P,
+) -> impl Stream<Item = Result<Key<'_>>> + Send + use<'_, P>
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
 {

src/database/map/keys_prefix.rs

@@ -1,16 +1,16 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{implement, Result};
-use futures::{future, Stream, StreamExt, TryStreamExt};
+use conduwuit::{Result, implement};
+use futures::{Stream, StreamExt, TryStreamExt, future};
 use serde::{Deserialize, Serialize};
 
-use crate::keyval::{result_deserialize_key, serialize_key, Key};
+use crate::keyval::{Key, result_deserialize_key, serialize_key};
 
 #[implement(super::Map)]
 pub fn keys_prefix<'a, K, P>(
 	self: &'a Arc<Self>,
 	prefix: &P,
-) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send + use<'a, K, P>
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -24,7 +24,7 @@ where
 pub fn keys_prefix_raw<P>(
 	self: &Arc<Self>,
 	prefix: &P,
-) -> impl Stream<Item = Result<Key<'_>>> + Send
+) -> impl Stream<Item = Result<Key<'_>>> + Send + use<'_, P>
 where
 	P: Serialize + ?Sized + Debug,
 {

src/database/map/qry.rs

@@ -1,17 +1,20 @@
 use std::{convert::AsRef, fmt::Debug, io::Write, sync::Arc};
 
-use conduwuit::{arrayvec::ArrayVec, implement, Result};
+use conduwuit::{Result, arrayvec::ArrayVec, implement};
 use futures::Future;
 use serde::Serialize;
 
-use crate::{keyval::KeyBuf, ser, Handle};
+use crate::{Handle, keyval::KeyBuf, ser};
 
 /// Fetch a value from the database into cache, returning a reference-handle
 /// asynchronously. The key is serialized into an allocated buffer to perform
 /// the query.
 #[implement(super::Map)]
 #[inline]
-pub fn qry<K>(self: &Arc<Self>, key: &K) -> impl Future<Output = Result<Handle<'_>>> + Send
+pub fn qry<K>(
+	self: &Arc<Self>,
+	key: &K,
+) -> impl Future<Output = Result<Handle<'_>>> + Send + use<'_, K>
 where
 	K: Serialize + ?Sized + Debug,
 {
@@ -27,7 +30,7 @@ where
 pub fn aqry<const MAX: usize, K>(
 	self: &Arc<Self>,
 	key: &K,
-) -> impl Future<Output = Result<Handle<'_>>> + Send
+) -> impl Future<Output = Result<Handle<'_>>> + Send + use<'_, MAX, K>
 where
 	K: Serialize + ?Sized + Debug,
 {
@@ -43,7 +46,7 @@ pub fn bqry<K, B>(
 	self: &Arc<Self>,
 	key: &K,
 	buf: &mut B,
-) -> impl Future<Output = Result<Handle<'_>>> + Send
+) -> impl Future<Output = Result<Handle<'_>>> + Send + use<'_, K, B>
 where
 	K: Serialize + ?Sized + Debug,
 	B: Write + AsRef<[u8]>,

src/database/map/qry_batch.rs

@@ -1,17 +1,16 @@
 use std::{fmt::Debug, sync::Arc};
 
 use conduwuit::{
-	implement,
+	Result, implement,
 	utils::{
-		stream::{automatic_amplification, automatic_width, WidebandExt},
 		IterStream,
+		stream::{WidebandExt, automatic_amplification, automatic_width},
 	},
-	Result,
 };
 use futures::{Stream, StreamExt, TryStreamExt};
 use serde::Serialize;
 
-use crate::{keyval::KeyBuf, ser, Handle};
+use crate::{Handle, keyval::KeyBuf, ser};
 
 pub trait Qry<'a, K, S>
 where

src/database/map/rev_keys.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use rocksdb::Direction;
 use serde::Deserialize;

src/database/map/rev_keys_from.rs

@@ -1,13 +1,13 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use rocksdb::Direction;
 use serde::{Deserialize, Serialize};
 
 use super::rev_stream_from::is_cached;
 use crate::{
-	keyval::{result_deserialize_key, serialize_key, Key},
+	keyval::{Key, result_deserialize_key, serialize_key},
 	stream,
 };
 
@@ -15,7 +15,7 @@ use crate::{
 pub fn rev_keys_from<'a, K, P>(
 	self: &'a Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send + use<'a, K, P>
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -29,7 +29,7 @@ where
 pub fn rev_keys_from_raw<P>(
 	self: &Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<Key<'_>>> + Send
+) -> impl Stream<Item = Result<Key<'_>>> + Send + use<'_, P>
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -41,7 +41,7 @@ where
 pub fn rev_keys_raw_from<'a, K, P>(
 	self: &'a Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<Key<'_, K>>> + Send
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send + use<'a, K, P>
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
@@ -55,7 +55,7 @@ where
 pub fn rev_raw_keys_from<P>(
 	self: &Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<Key<'_>>> + Send
+) -> impl Stream<Item = Result<Key<'_>>> + Send + use<'_, P>
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
 {

src/database/map/rev_keys_prefix.rs

@@ -1,16 +1,16 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{implement, Result};
-use futures::{future, Stream, StreamExt, TryStreamExt};
+use conduwuit::{Result, implement};
+use futures::{Stream, StreamExt, TryStreamExt, future};
 use serde::{Deserialize, Serialize};
 
-use crate::keyval::{result_deserialize_key, serialize_key, Key};
+use crate::keyval::{Key, result_deserialize_key, serialize_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
+) -> impl Stream<Item = Result<Key<'_, K>>> + Send + use<'a, K, P>
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -24,7 +24,7 @@ where
 pub fn rev_keys_prefix_raw<P>(
 	self: &Arc<Self>,
 	prefix: &P,
-) -> impl Stream<Item = Result<Key<'_>>> + Send
+) -> impl Stream<Item = Result<Key<'_>>> + Send + use<'_, P>
 where
 	P: Serialize + ?Sized + Debug,
 {

src/database/map/rev_stream.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use rocksdb::Direction;
 use serde::Deserialize;

src/database/map/rev_stream_from.rs

@@ -1,13 +1,13 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use rocksdb::Direction;
 use serde::{Deserialize, Serialize};
 use tokio::task;
 
 use crate::{
-	keyval::{result_deserialize, serialize_key, KeyVal},
+	keyval::{KeyVal, result_deserialize, serialize_key},
 	stream,
 	util::is_incomplete,
 };
@@ -20,7 +20,7 @@ use crate::{
 pub fn rev_stream_from<'a, K, V, P>(
 	self: &'a Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + use<'a, K, V, P>
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -39,7 +39,7 @@ where
 pub fn rev_stream_from_raw<P>(
 	self: &Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + use<'_, P>
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -55,7 +55,7 @@ where
 pub fn rev_stream_raw_from<'a, K, V, P>(
 	self: &'a Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + use<'a, K, V, P>
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
@@ -74,7 +74,7 @@ where
 pub fn rev_raw_stream_from<P>(
 	self: &Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + use<'_, P>
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
 {

src/database/map/rev_stream_prefix.rs

@@ -1,10 +1,10 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{implement, Result};
-use futures::{future, Stream, StreamExt, TryStreamExt};
+use conduwuit::{Result, implement};
+use futures::{Stream, StreamExt, TryStreamExt, future};
 use serde::{Deserialize, Serialize};
 
-use crate::keyval::{result_deserialize, serialize_key, KeyVal};
+use crate::keyval::{KeyVal, result_deserialize, serialize_key};
 
 /// Iterate key-value entries in the map where the key matches a prefix.
 ///
@@ -14,7 +14,7 @@ use crate::keyval::{result_deserialize, serialize_key, KeyVal};
 pub fn rev_stream_prefix<'a, K, V, P>(
 	self: &'a Arc<Self>,
 	prefix: &P,
-) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + use<'a, K, V, P>
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -33,7 +33,7 @@ where
 pub fn rev_stream_prefix_raw<P>(
 	self: &Arc<Self>,
 	prefix: &P,
-) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + use<'_, P>
 where
 	P: Serialize + ?Sized + Debug,
 {

src/database/map/stream.rs

@@ -1,6 +1,6 @@
 use std::sync::Arc;
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use rocksdb::Direction;
 use serde::Deserialize;

src/database/map/stream_from.rs

@@ -1,13 +1,13 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{implement, Result};
+use conduwuit::{Result, implement};
 use futures::{FutureExt, Stream, StreamExt, TryFutureExt, TryStreamExt};
 use rocksdb::Direction;
 use serde::{Deserialize, Serialize};
 use tokio::task;
 
 use crate::{
-	keyval::{result_deserialize, serialize_key, KeyVal},
+	keyval::{KeyVal, result_deserialize, serialize_key},
 	stream,
 };
 
@@ -19,7 +19,7 @@ use crate::{
 pub fn stream_from<'a, K, V, P>(
 	self: &'a Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + use<'a, K, V, P>
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -37,7 +37,7 @@ where
 pub fn stream_from_raw<P>(
 	self: &Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + use<'_, P>
 where
 	P: Serialize + ?Sized + Debug,
 {
@@ -53,7 +53,7 @@ where
 pub fn stream_raw_from<'a, K, V, P>(
 	self: &'a Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + use<'a, K, V, P>
 where
 	P: AsRef<[u8]> + ?Sized + Debug + Sync,
 	K: Deserialize<'a> + Send,
@@ -71,7 +71,7 @@ where
 pub fn raw_stream_from<P>(
 	self: &Arc<Self>,
 	from: &P,
-) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + use<'_, P>
 where
 	P: AsRef<[u8]> + ?Sized + Debug,
 {

src/database/map/stream_prefix.rs

@@ -1,10 +1,10 @@
 use std::{convert::AsRef, fmt::Debug, sync::Arc};
 
-use conduwuit::{implement, Result};
-use futures::{future, Stream, StreamExt, TryStreamExt};
+use conduwuit::{Result, implement};
+use futures::{Stream, StreamExt, TryStreamExt, future};
 use serde::{Deserialize, Serialize};
 
-use crate::keyval::{result_deserialize, serialize_key, KeyVal};
+use crate::keyval::{KeyVal, result_deserialize, serialize_key};
 
 /// Iterate key-value entries in the map where the key matches a prefix.
 ///
@@ -14,7 +14,7 @@ use crate::keyval::{result_deserialize, serialize_key, KeyVal};
 pub fn stream_prefix<'a, K, V, P>(
 	self: &'a Arc<Self>,
 	prefix: &P,
-) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_, K, V>>> + Send + use<'a, K, V, P>
 where
 	P: Serialize + ?Sized + Debug,
 	K: Deserialize<'a> + Send,
@@ -33,7 +33,7 @@ where
 pub fn stream_prefix_raw<P>(
 	self: &Arc<Self>,
 	prefix: &P,
-) -> impl Stream<Item = Result<KeyVal<'_>>> + Send
+) -> impl Stream<Item = Result<KeyVal<'_>>> + Send + use<'_, P>
 where
 	P: Serialize + ?Sized + Debug,
 {