Skip to content

Commit 7528763

Browse files
committed
All internals should have be named "unchecked"
1 parent 17c1a2e commit 7528763

File tree

2 files changed

+19
-19
lines changed

2 files changed

+19
-19
lines changed

src/date.rs

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -72,7 +72,7 @@ pub const fn days_in_year(year: i32) -> u16 {
7272
/// ```
7373
#[inline(always)]
7474
pub fn weeks_in_year(year: i32) -> u8 {
75-
let weekday = internals::Date::from_yo(year, 1).weekday();
75+
let weekday = internals::Date::from_yo_unchecked(year, 1).weekday();
7676

7777
if (weekday == Thursday) || (weekday == Wednesday && is_leap_year(year)) {
7878
53
@@ -126,7 +126,7 @@ impl Date {
126126
assert_value_in_range!(month in 1 => 12);
127127
assert_value_in_range!(day in 1 => days_in_year_month(year, month), given year, month);
128128

129-
internals::Date::from_ymd(year, month, day)
129+
internals::Date::from_ymd_unchecked(year, month, day)
130130
}
131131

132132
/// Attempt to create a `Date` from the year, month, and day.
@@ -148,7 +148,7 @@ impl Date {
148148
ensure_value_in_range!(month in 1 => 12);
149149
ensure_value_in_range!(day in 1 => days_in_year_month(year, month), given year, month);
150150

151-
Ok(internals::Date::from_ymd(year, month, day))
151+
Ok(internals::Date::from_ymd_unchecked(year, month, day))
152152
}
153153

154154
/// Create a `Date` from the year and ordinal day number.
@@ -222,7 +222,7 @@ impl Date {
222222
#[cfg_attr(doc, doc(cfg(feature = "panicking-api")))]
223223
pub fn from_iso_ywd(year: i32, week: u8, weekday: Weekday) -> Self {
224224
assert_value_in_range!(week in 1 => weeks_in_year(year), given year);
225-
internals::Date::from_iso_ywd(year, week, weekday)
225+
internals::Date::from_iso_ywd_unchecked(year, week, weekday)
226226
}
227227

228228
/// Attempt to create a `Date` from the ISO year, week, and weekday.
@@ -247,7 +247,7 @@ impl Date {
247247
weekday: Weekday,
248248
) -> Result<Self, ComponentRangeError> {
249249
ensure_value_in_range!(week in 1 => weeks_in_year(year), given year);
250-
Ok(internals::Date::from_iso_ywd(year, week, weekday))
250+
Ok(internals::Date::from_iso_ywd_unchecked(year, week, weekday))
251251
}
252252

253253
/// Create a `Date` representing the current date.
@@ -687,7 +687,7 @@ impl Date {
687687

688688
// TODO Seek out a formal proof that this always results in a valid value.
689689
#[allow(clippy::cast_possible_truncation, clippy::cast_sign_loss)]
690-
internals::Date::from_ymd(year as i32, month as u8, day as u8)
690+
internals::Date::from_ymd_unchecked(year as i32, month as u8, day as u8)
691691
}
692692
}
693693

@@ -977,7 +977,7 @@ impl Date {
977977
/// Monday-based week numbering.
978978
#[inline(always)]
979979
fn adjustment(year: i32) -> i16 {
980-
match internals::Date::from_yo(year, 1).weekday() {
980+
match internals::Date::from_yo_unchecked(year, 1).weekday() {
981981
Monday => 7,
982982
Tuesday => 1,
983983
Wednesday => 2,
@@ -990,14 +990,14 @@ impl Date {
990990

991991
// Verification for all components is done at parse time.
992992
match items {
993-
items!(year, month, day) => Ok(internals::Date::from_ymd(year, month.get(), day.get())),
994-
items!(year, ordinal_day) => Ok(internals::Date::from_yo(year, ordinal_day.get())),
995-
items!(week_based_year, iso_week, weekday) => Ok(internals::Date::from_iso_ywd(
993+
items!(year, month, day) => Ok(internals::Date::from_ymd_unchecked(year, month.get(), day.get())),
994+
items!(year, ordinal_day) => Ok(internals::Date::from_yo_unchecked(year, ordinal_day.get())),
995+
items!(week_based_year, iso_week, weekday) => Ok(internals::Date::from_iso_ywd_unchecked(
996996
week_based_year,
997997
iso_week.get(),
998998
weekday,
999999
)),
1000-
items!(year, sunday_week, weekday) => Ok(internals::Date::from_yo(
1000+
items!(year, sunday_week, weekday) => Ok(internals::Date::from_yo_unchecked(
10011001
year,
10021002
#[allow(clippy::cast_sign_loss)]
10031003
{
@@ -1006,7 +1006,7 @@ impl Date {
10061006
+ 1) as u16
10071007
},
10081008
)),
1009-
items!(year, monday_week, weekday) => Ok(internals::Date::from_yo(
1009+
items!(year, monday_week, weekday) => Ok(internals::Date::from_yo_unchecked(
10101010
year,
10111011
#[allow(clippy::cast_sign_loss)]
10121012
{

src/internals.rs

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,13 @@ pub struct Date;
3838
impl Date {
3939
// macros
4040
#[inline(always)]
41-
pub const fn from_yo(year: i32, ordinal: u16) -> crate::Date {
41+
pub const fn from_yo_unchecked(year: i32, ordinal: u16) -> crate::Date {
4242
crate::Date { year, ordinal }
4343
}
4444

4545
// reduce duplication
4646
#[inline]
47-
pub(crate) const fn from_ymd(year: i32, month: u8, day: u8) -> crate::Date {
47+
pub(crate) const fn from_ymd_unchecked(year: i32, month: u8, day: u8) -> crate::Date {
4848
/// Cumulative days through the beginning of a month in both common and
4949
/// leap years.
5050
const DAYS_CUMULATIVE_COMMON_LEAP: [[u16; 12]; 2] = [
@@ -62,19 +62,19 @@ impl Date {
6262

6363
// reduce duplication
6464
#[inline]
65-
pub(crate) fn from_iso_ywd(year: i32, week: u8, weekday: Weekday) -> crate::Date {
65+
pub(crate) fn from_iso_ywd_unchecked(year: i32, week: u8, weekday: Weekday) -> crate::Date {
6666
let ordinal = week as u16 * 7 + weekday.iso_weekday_number() as u16
67-
- (Self::from_yo(year, 4).weekday().iso_weekday_number() as u16 + 3);
67+
- (Self::from_yo_unchecked(year, 4).weekday().iso_weekday_number() as u16 + 3);
6868

6969
if ordinal < 1 {
70-
return Self::from_yo(year - 1, ordinal + days_in_year(year - 1));
70+
return Self::from_yo_unchecked(year - 1, ordinal + days_in_year(year - 1));
7171
}
7272

7373
let days_in_cur_year = days_in_year(year);
7474
if ordinal > days_in_cur_year {
75-
Self::from_yo(year + 1, ordinal - days_in_cur_year)
75+
Self::from_yo_unchecked(year + 1, ordinal - days_in_cur_year)
7676
} else {
77-
Self::from_yo(year, ordinal)
77+
Self::from_yo_unchecked(year, ordinal)
7878
}
7979
}
8080
}

0 commit comments

Comments
 (0)