Resolve "Bug: lifetime constraints causing errors while combining functions"

Closes #28 (closed)

src/query/fns/aggregate.rs

@@ -66,7 +66,7 @@ impl<F: Fn(&mut fmt::Formatter) -> fmt::Result> IntoQuery for AggrFunc<'_, F> {
 /// The sum aggregate operator/function
 #[inline]
 pub fn sum<'a>(
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     basic_fn("sum", vec_expr).into()
 }
@@ -74,7 +74,7 @@ pub fn sum<'a>(
 /// The min aggregate operator/function
 #[inline]
 pub fn min<'a>(
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     basic_fn("min", vec_expr).into()
 }
@@ -82,7 +82,7 @@ pub fn min<'a>(
 /// The max aggregate operator/function
 #[inline]
 pub fn max<'a>(
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     basic_fn("max", vec_expr).into()
 }
@@ -90,7 +90,7 @@ pub fn max<'a>(
 /// The avg aggregate operator/function
 #[inline]
 pub fn avg<'a>(
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     basic_fn("avg", vec_expr).into()
 }
@@ -98,7 +98,7 @@ pub fn avg<'a>(
 /// The group aggregate operator/function
 #[inline]
 pub fn group<'a>(
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     basic_fn("group", vec_expr).into()
 }
@@ -106,7 +106,7 @@ pub fn group<'a>(
 /// The stddev aggregate operator/function
 #[inline]
 pub fn stddev<'a>(
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     basic_fn("stddev", vec_expr).into()
 }
@@ -114,7 +114,7 @@ pub fn stddev<'a>(
 /// The stdvar aggregate operator/function
 #[inline]
 pub fn stdvar<'a>(
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     basic_fn("stdvar", vec_expr).into()
 }
@@ -122,7 +122,7 @@ pub fn stdvar<'a>(
 /// The count aggregate operator/function
 #[inline]
 pub fn count<'a>(
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     basic_fn("count", vec_expr).into()
 }
@@ -130,9 +130,9 @@ pub fn count<'a>(
 /// The count_values aggregate operator/function
 #[inline]
 pub fn count_values<'a>(
-    label: &'_ str,
-    vec_expr: impl Operable + 'static,
-) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result + '_> {
+    label: &'a str,
+    vec_expr: impl Operable + 'a,
+) -> AggrFunc<'_, impl Fn(&mut fmt::Formatter) -> fmt::Result + '_> {
     qry_fn!(count_values, r#""{label}", {vec_expr}"#).into()
 }
 
@@ -140,7 +140,7 @@ pub fn count_values<'a>(
 #[inline]
 pub fn topk<'a>(
     k: usize,
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     qry_fn!(topk, "{k}, {vec_expr}").into()
 }
@@ -149,7 +149,7 @@ pub fn topk<'a>(
 #[inline]
 pub fn bottomk<'a>(
     k: usize,
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     qry_fn!(bottomk, "{k}, {vec_expr}").into()
 }
@@ -158,7 +158,7 @@ pub fn bottomk<'a>(
 #[inline]
 pub fn quantile<'a>(
     phi: f32,
-    vec_expr: impl Operable + 'static,
+    vec_expr: impl Operable,
 ) -> AggrFunc<'a, impl Fn(&mut fmt::Formatter) -> fmt::Result> {
     qry_fn!(quantile, "{phi}, {vec_expr}").into()
 }