Make some traits pub(crate) if they are able to be made pub(crate)

unicode-org · Nov 20, 2023 · a8b3f6a · a8b3f6a
1 parent 9bf2525
commit a8b3f6a
Show file tree

Hide file tree

Showing 6 changed files with 11 additions and 7 deletions.
diff --git a/components/calendar/src/calendar_arithmetic.rs b/components/calendar/src/calendar_arithmetic.rs
@@ -10,7 +10,7 @@ use tinystr::tinystr;
 // Note: The Ord/PartialOrd impls can be derived because the fields are in the correct order.
 #[derive(Debug, Hash, Eq, PartialEq, Ord, PartialOrd)]
 #[allow(clippy::exhaustive_structs)] // this type is stable
-pub struct ArithmeticDate<C> {
+pub(crate) struct ArithmeticDate<C> {
     pub year: i32,
     /// 1-based month of year
     pub month: u8,
@@ -30,7 +30,7 @@ impl<C> Clone for ArithmeticDate<C> {
 #[allow(dead_code)] // TODO: Remove dead code tag after use
 pub(crate) const MAX_ITERS_FOR_DAYS_OF_MONTH: u8 = 33;
 
-pub trait CalendarArithmetic: Calendar {
+pub(crate) trait CalendarArithmetic: Calendar {
     fn month_days(year: i32, month: u8) -> u8;
     fn months_for_every_year(year: i32) -> u8;
     fn is_leap_year(year: i32) -> bool;

diff --git a/components/datetime/src/datetime.rs b/components/datetime/src/datetime.rs
@@ -20,7 +20,7 @@ use icu_provider::prelude::*;
 use writeable::Writeable;
 
 use crate::{
-    calendar, input::DateInput, input::DateTimeInput, input::IsoTimeInput, CldrCalendar,
+    calendar, input::DateInput, input::DateTimeInput, input::IsoTimeInput, calendar::CldrCalendar,
     DateTimeError, FormattedDateTime,
 };
 

diff --git a/components/datetime/src/lib.rs b/components/datetime/src/lib.rs
@@ -151,6 +151,7 @@ mod zoned_datetime;
 mod any;
 
 pub use any::{DateFormatter, DateTimeFormatter, ZonedDateTimeFormatter};
+// TODO(#2856): Stop exporting CldrCalendar
 pub use calendar::CldrCalendar;
 pub use datetime::{TimeFormatter, TypedDateFormatter, TypedDateTimeFormatter};
 pub use error::DateTimeError;

diff --git a/components/datetime/src/provider/date_time.rs b/components/datetime/src/provider/date_time.rs
@@ -309,7 +309,7 @@ where
     }
 }
 
-pub trait DateSymbols<'data> {
+pub(crate) trait DateSymbols<'data> {
     /// The bool is `true` if the return value is a leap month fallback needing a qualifier.
     fn get_symbol_for_month(
         &self,
@@ -445,7 +445,10 @@ impl<'data> DateSymbols<'data> for provider::calendar::DateSymbolsV1<'data> {
     }
 }
 
-pub trait TimeSymbols {
+pub(crate) trait TimeSymbols {
+    /// Gets the day period symbol.
+    ///
+    /// Internally, 'noon' and 'midnight' should fall back to 'am' and 'pm'.
     fn get_symbol_for_day_period(
         &self,
         day_period: fields::DayPeriod,

diff --git a/components/datetime/src/zoned_datetime.rs b/components/datetime/src/zoned_datetime.rs
@@ -22,7 +22,7 @@ use crate::{
     },
     raw,
     time_zone::TimeZoneFormatterOptions,
-    CldrCalendar, DateTimeError,
+    calendar::CldrCalendar, DateTimeError,
 };
 
 /// The composition of [`TypedDateTimeFormatter`](crate::TypedDateTimeFormatter) and [`TimeZoneFormatter`].

diff --git a/experimental/zerotrie/src/builder/nonconst/store.rs b/experimental/zerotrie/src/builder/nonconst/store.rs
@@ -10,7 +10,7 @@ use alloc::collections::VecDeque;
 use alloc::vec::Vec;
 
 /// A trait applied to a data structure for building a ZeroTrie.
-pub trait TrieBuilderStore {
+pub(crate) trait TrieBuilderStore {
     /// Create a new empty store.
     fn atbs_new_empty() -> Self;