WIP

Forked at: aaee912
Parent branch: chronotope/main

Cargo.toml

@@ -52,6 +52,7 @@ bincode = { version = "0.8.0" }
 num-iter = { version = "0.1.35", default-features = false }
 criterion = { version = "0.3" }
 doc-comment = { version = "0.3" }
+pure-rust-locales = { version = "0.2.1" }
 
 [target.'cfg(all(target_arch = "wasm32", not(any(target_os = "emscripten", target_os = "wasi"))))'.dev-dependencies]
 wasm-bindgen-test = "0.3"

src/date.rs

@@ -10,7 +10,7 @@ use core::ops::{Add, Sub};
 use core::{fmt, hash};
 use oldtime::Duration as OldDuration;
 
-#[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+#[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
 use format::DelayedFormatLocalized;
 #[cfg(any(feature = "alloc", feature = "std", test))]
 use format::{DelayedFormat, Item, StrftimeItems};
@@ -299,7 +299,7 @@ where
     }
 
     /// Formats the date with the specified formatting items.
-    #[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+    #[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
     #[inline]
     pub fn format_localized_with_items<'a, I, B>(&self, items: I) -> DelayedFormatLocalized<I>
     where
@@ -312,7 +312,7 @@ where
     /// Formats the date with the specified format string.
     /// See the [`format::strftime` module](./format/strftime/index.html)
     /// on the supported escape sequences.
-    #[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+    #[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
     #[inline]
     pub fn format_localized<'a>(&self, fmt: &'a str) -> DelayedFormatLocalized<StrftimeItems<'a>> {
         self.format_localized_with_items(StrftimeItems::new(fmt))

src/datetime.rs

@@ -19,7 +19,7 @@ use std::string::ToString;
 use core::borrow::Borrow;
 #[cfg(any(feature = "alloc", feature = "std", test))]
 use format::DelayedFormat;
-#[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+#[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
 use format::DelayedFormatLocalized;
 use format::{parse, ParseError, ParseResult, Parsed, StrftimeItems};
 use format::{Fixed, Item};
@@ -497,7 +497,7 @@ where
     }
 
     /// Formats the combined date and time with the specified formatting items.
-    #[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+    #[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
     #[inline]
     pub fn format_localized_with_items<'a, I, B>(&self, items: I) -> DelayedFormatLocalized<I>
     where
@@ -516,7 +516,7 @@ where
     /// Formats the combined date and time with the specified format string.
     /// See the [`format::strftime` module](./format/strftime/index.html)
     /// on the supported escape sequences.
-    #[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+    #[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
     #[inline]
     pub fn format_localized<'a>(&self, fmt: &'a str) -> DelayedFormatLocalized<StrftimeItems<'a>> {
         self.format_localized_with_items(StrftimeItems::new(fmt))

src/format/locales.rs

@@ -3,6 +3,7 @@ use super::{FormatError, FormatErrorKind, FormatResult};
 macro_rules! locale_match {
     ($locale:expr => $($item:ident)::+) => {{
         match $locale {
+            "POSIX" => Ok(pure_rust_locales::POSIX::$($item)::+),
             "en_US" => Ok(pure_rust_locales::en_US::$($item)::+),
             "fr_BE" => Ok(pure_rust_locales::fr_BE::$($item)::+),
             // TODO: all the locales are available

src/format/mod.rs

@@ -38,7 +38,7 @@ use offset::{FixedOffset, Offset};
 use {Datelike, Timelike};
 use {ParseWeekdayError, Weekday};
 
-#[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+#[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
 mod locales;
 
 pub use self::parse::parse;
@@ -391,7 +391,7 @@ pub struct FormatError(FormatErrorKind);
 #[derive(Debug, Clone, PartialEq, Eq, Copy)]
 enum FormatErrorKind {
     /// The locale is unknown or not available.
-    #[cfg(feature = "locales")]
+    #[cfg(any(feature = "locales", test))]
     UnknownLocale,
 
     /// Format error.
@@ -412,7 +412,7 @@ pub type FormatResult<T> = Result<T, FormatError>;
 impl fmt::Display for FormatError {
     fn fmt(&self, f: &mut fmt::Formatter) -> fmt::Result {
         match self.0 {
-            #[cfg(feature = "locales")]
+            #[cfg(any(feature = "locales", test))]
             FormatErrorKind::UnknownLocale => write!(f, "the locale is unknown or not available"),
             FormatErrorKind::Format => write!(f, "{}", fmt::Error),
             FormatErrorKind::InsufficientArguments => {
@@ -463,18 +463,18 @@ fn format_inner<'a>(
     #[allow(unused_variables)] locale: &str,
 ) -> FormatResult<()> {
     // full and abbreviated month and weekday names
-    #[cfg(feature = "locales")]
+    #[cfg(any(feature = "locales", test))]
     let short_months = locales::short_months(locale)?;
-    #[cfg(feature = "locales")]
+    #[cfg(any(feature = "locales", test))]
     let long_months = locales::long_months(locale)?;
-    #[cfg(feature = "locales")]
+    #[cfg(any(feature = "locales", test))]
     let short_weekdays = locales::short_weekdays(locale)?;
-    #[cfg(feature = "locales")]
+    #[cfg(any(feature = "locales", test))]
     let long_weekdays = locales::long_weekdays(locale)?;
-    #[cfg(not(feature = "locales"))]
+    #[cfg(not(any(feature = "locales", test)))]
     let short_months =
         &["Jan", "Feb", "Mar", "Apr", "May", "Jun", "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"];
-    #[cfg(not(feature = "locales"))]
+    #[cfg(not(any(feature = "locales", test)))]
     let long_months = &[
         "January",
         "February",
@@ -489,9 +489,9 @@ fn format_inner<'a>(
         "November",
         "December",
     ];
-    #[cfg(not(feature = "locales"))]
+    #[cfg(not(any(feature = "locales", test)))]
     let short_weekdays = &["Sun", "Mon", "Tue", "Wed", "Thu", "Fri", "Sat"];
-    #[cfg(not(feature = "locales"))]
+    #[cfg(not(any(feature = "locales", test)))]
     let long_weekdays =
         &["Sunday", "Monday", "Tuesday", "Wednesday", "Thursday", "Friday", "Saturday"];
 
@@ -888,7 +888,7 @@ impl FromStr for Weekday {
 }
 
 /// Formats single formatting item
-#[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+#[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
 pub fn format_item_localized<'a>(
     w: &mut fmt::Formatter,
     date: Option<&NaiveDate>,
@@ -898,14 +898,14 @@ pub fn format_item_localized<'a>(
     locale: &str,
 ) -> FormatResult<()> {
     let mut result = String::new();
-    format_inner_localized(&mut result, date, time, off, item, locale)?;
+    format_inner(&mut result, date, time, off, item, locale)?;
     w.pad(&result)?;
     Ok(())
 }
 
 /// Tries to format given arguments with given formatting items.
 /// Internally used by `DelayedFormat`.
-#[cfg(all(feature = "locales", any(feature = "alloc", feature = "std", test)))]
+#[cfg(any(all(feature = "locales", any(feature = "alloc", feature = "std")), test))]
 pub fn format_localized<'a, I, B>(
     w: &mut fmt::Formatter,
     date: Option<&NaiveDate>,
@@ -920,7 +920,7 @@ where
 {
     let mut result = String::new();
     for item in items {
-        format_inner_localized(&mut result, date, time, off, item.borrow(), locale)?;
+        format_inner(&mut result, date, time, off, item.borrow(), locale)?;
     }
     w.pad(&result)?;
     Ok(())

src/format/strftime.rs

@@ -520,7 +520,6 @@ fn test_strftime_docs() {
 }
 
 #[cfg(test)]
-#[cfg(feature = "locales")] // TODO: remove
 #[test]
 fn test_strftime_docs_localized() {
     use {FixedOffset, TimeZone, Timelike};

src/lib.rs

@@ -435,7 +435,7 @@ extern crate serde as serdelib;
 extern crate doc_comment;
 #[cfg(all(target_arch = "wasm32", not(target_os = "wasi"), feature = "wasmbind"))]
 extern crate js_sys;
-#[cfg(feature = "locales")]
+#[cfg(any(feature = "locales", test))]
 extern crate pure_rust_locales;
 #[cfg(feature = "bench")]
 extern crate test;