From 94c5a487cc59501bc60261d36a9ddd7e2567ff83 Mon Sep 17 00:00:00 2001 From: Tristan Guichaoua Date: Wed, 22 Nov 2023 13:00:21 +0100 Subject: [PATCH] rename EveryDay into AllDays --- src/day.rs | 22 ++++++++++++++-------- src/template/commands/all.rs | 4 ++-- 2 files changed, 16 insertions(+), 10 deletions(-) diff --git a/src/day.rs b/src/day.rs index 456da89..624ba0c 100644 --- a/src/day.rs +++ b/src/day.rs @@ -2,7 +2,6 @@ use std::error::Error; use std::fmt::Display; use std::str::FromStr; - /// A valid day number of advent (i.e. an integer in range 1 to 25). /// /// # Display @@ -82,16 +81,23 @@ impl Display for DayFromStrError { /* -------------------------------------------------------------------------- */ /// An iterator that yields every day of advent from the 1st to the 25th. -pub fn every_day() -> EveryDay { - EveryDay { current: 1 } +pub fn all_days() -> AllDays { + AllDays::new() } -/// An iterator that yield every day of advent from the 1st to the 25th. -pub struct EveryDay { +/// An iterator that yields every day of advent from the 1st to the 25th. +pub struct AllDays { current: u8, } -impl Iterator for EveryDay { +impl AllDays { + #[allow(clippy::new_without_default)] + pub fn new() -> Self { + Self { current: 1 } + } +} + +impl Iterator for AllDays { type Item = Day; fn next(&mut self) -> Option { @@ -128,11 +134,11 @@ macro_rules! day { #[cfg(feature = "test_lib")] mod tests { - use super::{every_day, Day}; + use super::{all_days, Day}; #[test] fn every_day_iterator() { - let mut iter = every_day(); + let mut iter = all_days(); assert_eq!(iter.next(), Some(Day(1))); assert_eq!(iter.next(), Some(Day(2))); diff --git a/src/template/commands/all.rs b/src/template/commands/all.rs index a1d4696..7443322 100644 --- a/src/template/commands/all.rs +++ b/src/template/commands/all.rs @@ -4,12 +4,12 @@ use crate::template::{ readme_benchmarks::{self, Timings}, ANSI_BOLD, ANSI_ITALIC, ANSI_RESET, }; -use crate::{every_day, Day}; +use crate::{all_days, Day}; pub fn handle(is_release: bool, is_timed: bool) { let mut timings: Vec = vec![]; - every_day().for_each(|day| { + all_days().for_each(|day| { if day > 1 { println!(); }