mirror of
https://forgejo.ellis.link/continuwuation/continuwuity.git
synced 2025-09-10 10:12:50 +02:00
b5a2e49ae4
The latest Rust nightly compiler (2025-08-27) introduced the
elided-named-lifetimes lint which causes Clippy CI checks to fail
when an elided lifetime ('_) resolves to a named lifetime that's
already in scope.
This commit fixes the Clippy warnings by:
- Making lifetime relationships explicit where 'a is already in scope
- Keeping elided lifetimes ('_) in functions without explicit
lifetime parameters
- Ensuring proper lifetime handling in the database pool module
Affected files (17 total):
- Database map modules: Handle, Key, and KeyVal references in get,
qry, keys, and stream operations
- Database pool module: into_recv_seek function
This change resolves the CI build failures without changing any
functionality, ensuring the codebase remains compatible with the
latest nightly Clippy checks.
83 lines
2 KiB
Rust
83 lines
2 KiB
Rust
use std::{convert::AsRef, fmt::Debug, sync::Arc};
|
|
|
|
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::{Key, result_deserialize_key, serialize_key},
|
|
stream,
|
|
};
|
|
|
|
#[implement(super::Map)]
|
|
pub fn keys_from<'a, K, P>(
|
|
self: &'a Arc<Self>,
|
|
from: &P,
|
|
) -> impl Stream<Item = Result<Key<'a, K>>> + Send + use<'a, K, P>
|
|
where
|
|
P: Serialize + ?Sized + Debug,
|
|
K: Deserialize<'a> + Send,
|
|
{
|
|
self.keys_from_raw(from).map(result_deserialize_key::<K>)
|
|
}
|
|
|
|
#[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 + use<'_, P>
|
|
where
|
|
P: Serialize + ?Sized + Debug,
|
|
{
|
|
let key = serialize_key(from).expect("failed to serialize query key");
|
|
self.raw_keys_from(&key)
|
|
}
|
|
|
|
#[implement(super::Map)]
|
|
pub fn keys_raw_from<'a, K, P>(
|
|
self: &'a Arc<Self>,
|
|
from: &P,
|
|
) -> impl Stream<Item = Result<Key<'a, K>>> + Send + use<'a, K, P>
|
|
where
|
|
P: AsRef<[u8]> + ?Sized + Debug + Sync,
|
|
K: Deserialize<'a> + Send,
|
|
{
|
|
self.raw_keys_from(from).map(result_deserialize_key::<K>)
|
|
}
|
|
|
|
#[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 + use<'_, P>
|
|
where
|
|
P: AsRef<[u8]> + ?Sized + Debug,
|
|
{
|
|
use crate::pool::Seek;
|
|
|
|
let opts = super::iter_options_default(&self.db);
|
|
let state = stream::State::new(self, opts);
|
|
if is_cached(self, from) {
|
|
return stream::Keys::<'_>::from(state.init_fwd(from.as_ref().into())).boxed();
|
|
}
|
|
|
|
let seek = Seek {
|
|
map: self.clone(),
|
|
dir: Direction::Forward,
|
|
key: Some(from.as_ref().into()),
|
|
state: crate::pool::into_send_seek(state),
|
|
res: None,
|
|
};
|
|
|
|
self.db
|
|
.pool
|
|
.execute_iter(seek)
|
|
.ok_into::<stream::Keys<'_>>()
|
|
.into_stream()
|
|
.try_flatten()
|
|
.boxed()
|
|
}
|