Fix UI tests, build on MSRV

Author: jhpratt

time-macros/src/lib.rs

@@ -75,7 +75,17 @@ enum FormatDescriptionVersion {
 fn parse_format_description_version<const NO_EQUALS_IS_MOD_NAME: bool>(
     iter: &mut PeekableTokenStreamIter,
 ) -> Result<Option<FormatDescriptionVersion>, Error> {
-    let version_ident = match iter.peek().ok_or(Error::UnexpectedEndOfInput)? {
+    let end_of_input_err = || {
+        if NO_EQUALS_IS_MOD_NAME {
+            Error::UnexpectedEndOfInput
+        } else {
+            Error::ExpectedString {
+                span_start: None,
+                span_end: None,
+            }
+        }
+    };
+    let version_ident = match iter.peek().ok_or_else(end_of_input_err)? {
         version @ TokenTree::Ident(ident) if ident.to_string() == "version" => {
             let version_ident = version.clone();
             iter.next(); // consume `version`

time/src/internal_macros.rs

@@ -63,7 +63,7 @@ macro_rules! div_floor {
                 // which is all-ones iff the signs differ, and 0 otherwise. Then by
                 // adding this mask (which corresponds to the signed value -1), we
                 // get our correction.
-                let correction = (this ^ rhs) >> (::core::mem::size_of_val(&this) * 8 - 1);
+                let correction = (this ^ rhs) >> ($crate::size_of_val(&this) * 8 - 1);
                 if r != 0 {
                     d + correction
                 } else {

time/src/lib.rs

@@ -141,3 +141,12 @@ pub type Result<T> = core::result::Result<T, Error>;
 const fn expect_failed(message: &str) -> ! {
     panic!("{}", message)
 }
+
+/// Returns the size of the pointed-to value in bytes.
+///
+/// This is a `const fn` in the standard library starting in Rust 1.85. When MSRV is at least that,
+/// this can be removed.
+#[allow(unused_qualifications)] // added to prelude after MSRV
+const fn size_of_val<T>(_: &T) -> usize {
+    core::mem::size_of::<T>()
+}

time/src/serde/mod.rs

@@ -53,7 +53,9 @@ use serde::{Deserialize, Deserializer, Serialize, Serializer};
 )]
 /// This puts a module named `mod_name` in the current scope that can be used to format `Date`
 /// structs. A submodule (`mod_name::option`) is also generated for `Option<Date>`. Both
-/// modules are only visible in the current scope.
+/// modules are only visible in the current scope by default. To increase visibility, you can
+/// specify `pub`, `pub(crate)`, or similar before the module name:
+/// `serde::format_description!(pub mod_name, Date, FORMAT)`.
 ///
 /// The returned `Option` will contain a deserialized value if present and `None` if the field
 /// is present but the value is `null` (or the equivalent in other formats). To return `None`