Skip to content

chore: fix inconsistent lifetime warnings #5

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

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

chore: fix inconsistent lifetime warnings #5

Show file tree
Hide file tree
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
2 changes: 1 addition & 1 deletion src/iter.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,7 +84,7 @@ impl<'a, B: BTreeTrait> Drain<'a, B> {
}
}

fn none(tree: &'a mut BTree<B>) -> Drain<B> {
fn none(tree: &'a mut BTree<B>) -> Drain<'a, B> {
Self {
current_path: Default::default(),
done: true,
Expand Down
6 changes: 3 additions & 3 deletions src/lib.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1609,11 +1609,11 @@ impl<B: BTreeTrait> BTree<B> {
})
}

pub fn drain(&mut self, range: Range<QueryResult>) -> iter::Drain<B> {
pub fn drain(&mut self, range: Range<QueryResult>) -> iter::Drain<'_, B> {
iter::Drain::new(self, Some(range.start), Some(range.end))
}

pub fn drain_by_query<Q: Query<B>>(&mut self, range: Range<Q::QueryArg>) -> iter::Drain<B> {
pub fn drain_by_query<Q: Query<B>>(&mut self, range: Range<Q::QueryArg>) -> iter::Drain<'_, B> {
let start = self.query::<Q>(&range.start);
let end = self.query::<Q>(&range.end);
iter::Drain::new(self, start, end)
Expand Down Expand Up @@ -2650,7 +2650,7 @@ impl<B: BTreeTrait> BTree<B> {
pub fn iter_with_filter<'a, R: Default + Copy + AddAssign + 'a>(
&'a self,
mut f: impl FnMut(&B::Cache) -> (bool, R) + 'a,
) -> impl Iterator<Item = (R, &'_ B::Elem)> + '_ {
) -> impl Iterator<Item = (R, &'a B::Elem)> + 'a {
let mut queue = VecDeque::new();
queue.push_back((self.root, R::default()));
std::iter::from_fn(move || {
Expand Down