Tom Foster
b5a2e49ae4
All checks were successful
Documentation / Build and Deploy Documentation (pull_request) Successful in 43s
Release Docker Image / define-variables (push) Successful in 17s
Documentation / Build and Deploy Documentation (push) Successful in 42s
Checks / Prek / Pre-commit & Formatting (push) Successful in 1m53s
Checks / Prek / Clippy and Cargo Tests (push) Successful in 5m20s
Release Docker Image / build-image (linux/amd64, release, linux-amd64, base) (push) Successful in 17m15s
Release Docker Image / build-image (linux/arm64, release, linux-arm64, base) (push) Successful in 15m43s
Release Docker Image / merge (push) Successful in 22s
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.
59 lines
1.5 KiB
Rust
59 lines
1.5 KiB
Rust
use std::{convert::AsRef, fmt::Debug, sync::Arc};
|
|
|
|
use conduwuit::{Result, implement};
|
|
use futures::{Stream, StreamExt, TryStreamExt, future};
|
|
use serde::{Deserialize, Serialize};
|
|
|
|
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<'a, K>>> + Send + use<'a, K, P>
|
|
where
|
|
P: Serialize + ?Sized + Debug,
|
|
K: Deserialize<'a> + Send,
|
|
{
|
|
self.keys_prefix_raw(prefix)
|
|
.map(result_deserialize_key::<K>)
|
|
}
|
|
|
|
#[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 + use<'_, P>
|
|
where
|
|
P: Serialize + ?Sized + Debug,
|
|
{
|
|
let key = serialize_key(prefix).expect("failed to serialize query key");
|
|
self.raw_keys_from(&key)
|
|
.try_take_while(move |k: &Key<'_>| future::ok(k.starts_with(&key)))
|
|
}
|
|
|
|
#[implement(super::Map)]
|
|
pub fn keys_raw_prefix<'a, K, P>(
|
|
self: &'a Arc<Self>,
|
|
prefix: &'a P,
|
|
) -> impl Stream<Item = Result<Key<'a, K>>> + Send + 'a
|
|
where
|
|
P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
|
|
K: Deserialize<'a> + Send + 'a,
|
|
{
|
|
self.raw_keys_prefix(prefix)
|
|
.map(result_deserialize_key::<K>)
|
|
}
|
|
|
|
#[implement(super::Map)]
|
|
pub fn raw_keys_prefix<'a, P>(
|
|
self: &'a Arc<Self>,
|
|
prefix: &'a P,
|
|
) -> impl Stream<Item = Result<Key<'a>>> + Send + 'a
|
|
where
|
|
P: AsRef<[u8]> + ?Sized + Debug + Sync + 'a,
|
|
{
|
|
self.raw_keys_from(prefix)
|
|
.try_take_while(|k: &Key<'_>| future::ok(k.starts_with(prefix.as_ref())))
|
|
}
|