Skip to content
Merged
Changes from all commits
Commits
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
53 changes: 51 additions & 2 deletions src/naive/mod.rs
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ pub use self::internals::YearFlags as __BenchYearFlags;

/// A week represented by a [`NaiveDate`] and a [`Weekday`] which is the first
/// day of the week.
#[derive(Clone, Copy, Debug, Eq, Hash, PartialEq)]
#[derive(Clone, Copy, Debug, Eq)]
pub struct NaiveWeek {
date: NaiveDate,
start: Weekday,
Expand Down Expand Up @@ -206,6 +206,19 @@ impl NaiveWeek {
}
}

impl PartialEq for NaiveWeek {
fn eq(&self, other: &Self) -> bool {
self.first_day() == other.first_day()
}
}

use core::hash::{Hash, Hasher};
impl Hash for NaiveWeek {
fn hash<H: Hasher>(&self, state: &mut H) {
self.first_day().hash(state);
}
}

/// A duration in calendar days.
///
/// This is useful because when using `TimeDelta` it is possible that adding `TimeDelta::days(1)`
Expand Down Expand Up @@ -235,7 +248,8 @@ pub mod serde {

#[cfg(test)]
mod test {
use crate::{NaiveDate, Weekday};
use crate::{NaiveDate, NaiveWeek, Weekday};
use std::hash::{DefaultHasher, Hash, Hasher};
#[test]
fn test_naiveweek() {
let date = NaiveDate::from_ymd_opt(2022, 5, 18).unwrap();
Expand Down Expand Up @@ -278,4 +292,39 @@ mod test {
let _ = date_min.week(Weekday::Mon).checked_days();
let _ = date_max.week(Weekday::Mon).checked_days();
}

#[test]
fn test_naiveweek_eq() {
let a =
NaiveWeek { date: NaiveDate::from_ymd_opt(2025, 4, 3).unwrap(), start: Weekday::Mon };
let b =
NaiveWeek { date: NaiveDate::from_ymd_opt(2025, 4, 4).unwrap(), start: Weekday::Mon };
assert_eq!(a, b);
let c =
NaiveWeek { date: NaiveDate::from_ymd_opt(2025, 4, 3).unwrap(), start: Weekday::Sun };
assert_ne!(a, c);
assert_ne!(b, c);
}

#[test]
fn test_naiveweek_hash() {
let mut hasher = DefaultHasher::default();
let a =
NaiveWeek { date: NaiveDate::from_ymd_opt(2025, 4, 3).unwrap(), start: Weekday::Mon };
let b =
NaiveWeek { date: NaiveDate::from_ymd_opt(2025, 4, 4).unwrap(), start: Weekday::Mon };
let c =
NaiveWeek { date: NaiveDate::from_ymd_opt(2025, 4, 3).unwrap(), start: Weekday::Sun };
a.hash(&mut hasher);
let a_hash = hasher.finish();
hasher = DefaultHasher::default();
b.hash(&mut hasher);
let b_hash = hasher.finish();
hasher = DefaultHasher::default();
c.hash(&mut hasher);
let c_hash = hasher.finish();
assert_eq!(a_hash, b_hash);
assert_ne!(b_hash, c_hash);
assert_ne!(a_hash, c_hash);
}
}