itsscb/chrono
1
0
Fork 0
mirror of https://github.com/chronotope/chrono.git synced 2025-10-03 07:46:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Simplify from_isoywd a bit

Browse Source
This commit is contained in:
Paul Dicker 2024-02-26 11:30:40 +01:00 committed by Paul Dicker
parent a6c0c6425c
commit e292d9bc90
1 changed files with 22 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

48
src/naive/date/mod.rs
View File

@ -314,33 +314,29 @@ impl NaiveDate {
pub const fn from_isoywd_opt(year: i32, week: u32, weekday: Weekday) -> Option<NaiveDate> { pub const fn from_isoywd_opt(year: i32, week: u32, weekday: Weekday) -> Option<NaiveDate> {
let flags = YearFlags::from_year(year); let flags = YearFlags::from_year(year);
let nweeks = flags.nisoweeks(); let nweeks = flags.nisoweeks();
if 1 <= week && week <= nweeks { if week == 0 || week > nweeks {
// ordinal = week ordinal - delta return None;
let weekord = week * 7 + weekday as u32;
let delta = flags.isoweek_delta();
if weekord <= delta {
// ordinal < 1, previous year
let prevflags = YearFlags::from_year(year - 1);
NaiveDate::from_ordinal_and_flags(
year - 1,
weekord + prevflags.ndays() - delta,
prevflags,
)
} else {
let ordinal = weekord - delta;
let ndays = flags.ndays();
if ordinal <= ndays {
// this year
NaiveDate::from_ordinal_and_flags(year, ordinal, flags)
} else {
// ordinal > ndays, next year
let nextflags = YearFlags::from_year(year + 1);
NaiveDate::from_ordinal_and_flags(year + 1, ordinal - ndays, nextflags)
}
}
} else {
None
} }
// ordinal = week ordinal - delta
let weekord = week * 7 + weekday as u32;
let delta = flags.isoweek_delta();
let (year, ordinal, flags) = if weekord <= delta {
// ordinal < 1, previous year
let prevflags = YearFlags::from_year(year - 1);
(year - 1, weekord + prevflags.ndays() - delta, prevflags)
} else {
let ordinal = weekord - delta;
let ndays = flags.ndays();
if ordinal <= ndays {
// this year
(year, ordinal, flags)
} else {
// ordinal > ndays, next year
let nextflags = YearFlags::from_year(year + 1);
(year + 1, ordinal - ndays, nextflags)
}
};
NaiveDate::from_ordinal_and_flags(year, ordinal, flags)
} }
/// Makes a new `NaiveDate` from a day's number in the proleptic Gregorian calendar, with /// Makes a new `NaiveDate` from a day's number in the proleptic Gregorian calendar, with