Skip to content

Fixup: Twelve days of AoC #1

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
Lollyde merged 3 commits into from
Dec 7, 2025
Merged

Fixup: Twelve days of AoC #1

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
0e01d76
Fixup month number 12
xsebek Dec 7, 2025
a64956d
Fixup error message
xsebek Dec 7, 2025
6b96da7
Use simple string literal, const str is hard
xsebek Dec 7, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 6 additions & 6 deletions src/template/day.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ impl Day {
pub fn today() -> Option<Self> {
let offset = FixedOffset::east_opt(SERVER_UTC_OFFSET * 3600)?;
let today = Utc::now().with_timezone(&offset);
if today.month() == day_count!() as u32 && today.day() <= day_count!() as u32 {
if today.month() == 12 && today.day() <= day_count!() as u32 {
Self::new(u8::try_from(today.day()).ok()?)
} else {
None
Expand Down Expand Up @@ -99,18 +99,18 @@ impl Error for DayFromStrError {}

impl Display for DayFromStrError {
fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
f.write_str("expecting a day number between 1 and 12")
f.write_str(&format!("expecting a day number between 1 and {}", day_count!()))
}
}

/* -------------------------------------------------------------------------- */

/// An iterator that yields every day of advent from the 1st to the 12th.
/// An iterator that yields every day of advent from the 1st to the 12th (or 25th before 2025).
pub fn all_days() -> AllDays {
AllDays::new()
}

/// An iterator that yields every day of advent from the 1st to the 12th.
/// An iterator that yields every day of advent from the 1st to the 12th (or 25th before 2025).
pub struct AllDays {
current: u8,
}
Expand All @@ -129,7 +129,7 @@ impl Iterator for AllDays {
if self.current > day_count!() {
return None;
}
// NOTE: the iterator starts at 1 and we have verified that the value is not above 12.
// NOTE: the iterator starts at 1, and we have verified that the value is not above 12 (or 25).
let day = Day(self.current);
self.current += 1;

Expand All @@ -145,7 +145,7 @@ macro_rules! day {
($day:expr) => {
const {
$crate::template::Day::new($day)
.expect("invalid day number, expecting a value between 1 and 12")
.expect("invalid day number, expecting a value between 1 and 12 (or 25 before 2025)")
}
};
}
Expand Down