From c5ae93a7ac10a1b7e8fc81418bbc788edc943f83 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Gustav=20S=C3=B6rn=C3=A4s?= Date: Sat, 31 Jul 2021 21:24:08 +0200 Subject: wip bad diagnostics 2 --- cli/src/main.rs | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) diff --git a/cli/src/main.rs b/cli/src/main.rs index 7d25b50..677ba1e 100644 --- a/cli/src/main.rs +++ b/cli/src/main.rs @@ -154,17 +154,18 @@ fn main() { } } -fn sort_by_func(sort: &SortTarget) -> impl FnMut(&Transaction, &Transaction) -> std::cmp::Ordering { +fn sort_by_func(sort: &SortTarget) -> Box std::cmp::Ordering> { match sort { - SortTarget::Amount => |t1: &Transaction, t2: &Transaction| t1.amount.cmp(&t2.amount), - SortTarget::Date => |t1: &Transaction, t2: &Transaction| t1.date.cmp(&t2.date), + SortTarget::Amount => |t1, t2| t1.amount.cmp(&t2.amount), + SortTarget::Date => |t1, t2| t1.date.cmp(&t2.date), } } -fn inner_sort_by(v: &mut [T], mut outer_cmp: F, mut inner_cmp: F) -where - F: FnMut(&T, &T) -> std::cmp::Ordering, -{ +fn inner_sort_by( + v: &mut [Transaction], + mut outer_cmp: Box std::cmp::Ordering>, + mut inner_cmp: Box std::cmp::Ordering>, +) { // Early out if v.len() < 2 { return; -- cgit v1.2.1