Skip to content

Fix streaming search lifetime regression without requiring 'static #39

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Draft
wants to merge 1 commit into
base: main
Choose a base branch
from
Draft

Fix streaming search lifetime regression without requiring 'static #39

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -138,6 +138,7 @@ use std::{

use filter::{AndFilter, EqFilter, Filter, OrFilter};
use futures::{Stream, StreamExt, executor::block_on, stream};
use std::pin::Pin;
use ldap3::{
Ldap, LdapConnAsync, LdapConnSettings, LdapError, LdapResult, Mod, Scope, SearchEntry,
SearchStream, StreamState,
Expand Down Expand Up @@ -656,7 +657,7 @@ impl LdapClient {
scope: Scope,
filter: &F,
attributes: A,
) -> Result<impl Stream<Item = Result<Record, Error>> + use<'a, F, A, S>, Error>
) -> Result<Pin<Box<dyn Stream<Item = Result<Record, Error>> + 'a>>, Error>
where
F: Filter,
A: AsRef<[S]> + Send + Sync + 'a,
Expand Down Expand Up @@ -778,7 +779,7 @@ impl LdapClient {
filter: &F,
attributes: A,
page_size: i32,
) -> Result<impl Stream<Item = Result<Record, Error>> + use<'a, F, A, S>, Error>
) -> Result<Pin<Box<dyn Stream<Item = Result<Record, Error>> + 'a>>, Error>
where
F: Filter,
// PagedResults requires Clone and Debug too.
Expand Down Expand Up @@ -1789,7 +1790,7 @@ where
/// A helper to create native rust streams out of `ldap3::SearchStream`s.
fn to_native_stream<'a, S, A>(
ldap3_stream: SearchStream<'a, S, A>,
) -> Result<impl Stream<Item = Result<Record, Error>> + use<'a, S, A>, Error>
) -> Result<Pin<Box<dyn Stream<Item = Result<Record, Error>> + 'a>>, Error>
where
S: AsRef<str> + Send + Sync + 'a,
A: AsRef<[S]> + Send + Sync + 'a,
Expand Down Expand Up @@ -1818,7 +1819,7 @@ where
}
});

Ok(stream)
Ok(Box::pin(stream))
}

/// The Record struct is used to map the search result to a struct.
Expand Down