From acfaa1be6ab6947a4b4abddab10ee7dc5f649c1a Mon Sep 17 00:00:00 2001 From: Salman Saghafi Date: Mon, 19 Oct 2026 00:19:25 -0400 Subject: [PATCH 1/2] Take the join key as impl Fn in the keyed helper --- core/src/database/evaluate.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/src/database/evaluate.rs b/core/src/database/evaluate.rs index 0db1d52..30da447 100644 --- a/core/src/database/evaluate.rs +++ b/core/src/database/evaluate.rs @@ -40,7 +40,7 @@ fn unsupported(name: &str) -> Error { /// Keys a batch for joining: returns `(key, tuple, weight)` sorted by key. fn keyed<'a, K: Tuple, T: Tuple>( batch: &'a Batch, - key: &dyn Fn(&T) -> K, + key: impl Fn(&T) -> K, ) -> Vec<(K, &'a T, isize)> { let mut result: Vec<(K, &T, isize)> = batch.items().iter().map(|(t, w)| (key(t), t, *w)).collect(); From 0afbb4757a436a76c6719b8b4df0b3ab9d47a53d Mon Sep 17 00:00:00 2001 From: Salman Saghafi Date: Mon, 19 Oct 2026 00:19:47 -0400 Subject: [PATCH 2/2] Elide the lifetime of the keyed helper --- core/src/database/evaluate.rs | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-) diff --git a/core/src/database/evaluate.rs b/core/src/database/evaluate.rs index 30da447..b119d2a 100644 --- a/core/src/database/evaluate.rs +++ b/core/src/database/evaluate.rs @@ -38,10 +38,7 @@ fn unsupported(name: &str) -> Error { } /// Keys a batch for joining: returns `(key, tuple, weight)` sorted by key. -fn keyed<'a, K: Tuple, T: Tuple>( - batch: &'a Batch, - key: impl Fn(&T) -> K, -) -> Vec<(K, &'a T, isize)> { +fn keyed(batch: &Batch, key: impl Fn(&T) -> K) -> Vec<(K, &T, isize)> { let mut result: Vec<(K, &T, isize)> = batch.items().iter().map(|(t, w)| (key(t), t, *w)).collect(); result.sort_by(|a, b| a.0.cmp(&b.0));