From 6d090b428f362730a2e90e04aa524fbfe2a4f926 Mon Sep 17 00:00:00 2001 From: Joscha Date: Sun, 5 Dec 2021 18:28:00 +0100 Subject: [PATCH] Sort entries for a single command by date --- src/eval/command.rs | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/src/eval/command.rs b/src/eval/command.rs index 01364f8..893bbaf 100644 --- a/src/eval/command.rs +++ b/src/eval/command.rs @@ -43,11 +43,16 @@ impl<'a> CommandState<'a> { Ok(self) } - pub fn entries(self) -> Vec { - self.dated - .into_values() - .chain(self.undated.into_iter()) - .collect() + pub fn entries(mut self) -> Vec { + let mut keys = self.dated.keys().copied().collect::>(); + keys.sort(); + + let mut entries = self.undated; + for key in keys { + entries.push(self.dated.remove(&key).unwrap()); + } + + entries } // Helper functions