MaybeLazy: Permit non function-pointer as lazy input

Author: Urgau

compiler/rustc_target/src/spec/maybe_lazy.rs

@@ -5,8 +5,8 @@ use std::fmt::{Debug, Display};
 use std::ops::Deref;
 use std::sync::LazyLock;
 
-enum MaybeLazyInner<T: 'static + ToOwned + ?Sized> {
-    Lazy(LazyLock<T::Owned>),
+enum MaybeLazyInner<T: 'static + ToOwned + ?Sized, F> {
+    Lazy(LazyLock<T::Owned, F>),
     Cow(Cow<'static, T>),
 }
 
@@ -16,16 +16,16 @@ enum MaybeLazyInner<T: 'static + ToOwned + ?Sized> {
 /// They can all be constructed from the [`MaybeLazy::borrowed`], [`MaybeLazy::owned`] and
 /// [`MaybeLazy::lazy`] methods.
 #[repr(transparent)]
-pub struct MaybeLazy<T: 'static + ToOwned + ?Sized> {
+pub struct MaybeLazy<T: 'static + ToOwned + ?Sized, F = fn() -> <T as ToOwned>::Owned> {
     // Inner state.
     //
     // Not to be inlined since we may want in the future to
     // make this struct usable to statics and we might need to
     // workaround const-eval limitation (particulary around drop).
-    inner: MaybeLazyInner<T>,
+    inner: MaybeLazyInner<T, F>,
 }
 
-impl<T: 'static + ?Sized + ToOwned> MaybeLazy<T> {
+impl<T: 'static + ?Sized + ToOwned, F: FnOnce() -> T::Owned> MaybeLazy<T, F> {
     /// Create a [`MaybeLazy`] from an borrowed `T`.
     #[inline]
     pub const fn borrowed(a: &'static T) -> Self {
@@ -38,17 +38,24 @@ impl<T: 'static + ?Sized + ToOwned> MaybeLazy<T> {
         MaybeLazy { inner: MaybeLazyInner::Cow(Cow::Owned(a)) }
     }
 
-    /// Create a [`MaybeLazy`] that is lazy by taking a function pointer.
-    ///
-    /// This function pointer cannot *ever* take a closure. User can potentially
-    /// workaround that by using closure-to-fnptr or `const` items.
+    /// Create a [`MaybeLazy`] from a function-able `F`.
+    #[inline]
+    pub const fn lazied(f: F) -> Self {
+        MaybeLazy { inner: MaybeLazyInner::Lazy(LazyLock::new(f)) }
+    }
+}
+
+impl<T: 'static + ?Sized + ToOwned> MaybeLazy<T> {
+    /// Create a [`MaybeLazy`] from a function pointer.
     #[inline]
     pub const fn lazy(a: fn() -> T::Owned) -> Self {
         MaybeLazy { inner: MaybeLazyInner::Lazy(LazyLock::new(a)) }
     }
 }
 
-impl<T: 'static + ?Sized + ToOwned<Owned: Clone>> Clone for MaybeLazy<T> {
+impl<T: 'static + ?Sized + ToOwned<Owned: Clone>, F: FnOnce() -> T::Owned> Clone
+    for MaybeLazy<T, F>
+{
     #[inline]
     fn clone(&self) -> Self {
         MaybeLazy {
@@ -60,15 +67,19 @@ impl<T: 'static + ?Sized + ToOwned<Owned: Clone>> Clone for MaybeLazy<T> {
     }
 }
 
-impl<T: 'static + ?Sized + ToOwned<Owned: Default>> Default for MaybeLazy<T> {
+impl<T: 'static + ?Sized + ToOwned<Owned: Default>, F: FnOnce() -> T::Owned> Default
+    for MaybeLazy<T, F>
+{
     #[inline]
-    fn default() -> MaybeLazy<T> {
-        MaybeLazy::lazy(T::Owned::default)
+    fn default() -> MaybeLazy<T, F> {
+        MaybeLazy::owned(T::Owned::default())
     }
 }
 
 // `Debug`, `Display` and other traits below are implemented in terms of this `Deref`
-impl<T: 'static + ?Sized + ToOwned<Owned: Borrow<T>>> Deref for MaybeLazy<T> {
+impl<T: 'static + ?Sized + ToOwned<Owned: Borrow<T>>, F: FnOnce() -> T::Owned> Deref
+    for MaybeLazy<T, F>
+{
     type Target = T;
 
     #[inline]
@@ -80,46 +91,54 @@ impl<T: 'static + ?Sized + ToOwned<Owned: Borrow<T>>> Deref for MaybeLazy<T> {
     }
 }
 
-impl<T: 'static + ?Sized + ToOwned<Owned: Debug> + Debug> Debug for MaybeLazy<T> {
+impl<T: 'static + ?Sized + ToOwned<Owned: Debug> + Debug, F: FnOnce() -> T::Owned> Debug
+    for MaybeLazy<T, F>
+{
     #[inline]
     fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         Debug::fmt(&**self, fmt)
     }
 }
 
-impl<T: 'static + ?Sized + ToOwned<Owned: Display> + Display> Display for MaybeLazy<T> {
+impl<T: 'static + ?Sized + ToOwned<Owned: Display> + Display, F: FnOnce() -> T::Owned> Display
+    for MaybeLazy<T, F>
+{
     #[inline]
     fn fmt(&self, fmt: &mut std::fmt::Formatter<'_>) -> std::fmt::Result {
         Display::fmt(&**self, fmt)
     }
 }
 
-impl<T: 'static + ?Sized + ToOwned> AsRef<T> for MaybeLazy<T> {
+impl<T: 'static + ?Sized + ToOwned, F: FnOnce() -> T::Owned> AsRef<T> for MaybeLazy<T, F> {
     #[inline]
     fn as_ref(&self) -> &T {
         &**self
     }
 }
 
-impl<B: ?Sized + PartialEq<C> + ToOwned, C: ?Sized + ToOwned> PartialEq<MaybeLazy<C>>
-    for MaybeLazy<B>
+impl<
+    B: ?Sized + PartialEq<C> + ToOwned,
+    C: ?Sized + ToOwned,
+    F1: FnOnce() -> B::Owned,
+    F2: FnOnce() -> C::Owned,
+> PartialEq<MaybeLazy<C, F2>> for MaybeLazy<B, F1>
 {
     #[inline]
-    fn eq(&self, other: &MaybeLazy<C>) -> bool {
+    fn eq(&self, other: &MaybeLazy<C, F2>) -> bool {
         PartialEq::eq(&**self, &**other)
     }
 }
 
-impl PartialEq<&str> for MaybeLazy<str> {
+impl<F: FnOnce() -> String> PartialEq<&str> for MaybeLazy<str, F> {
     #[inline]
     fn eq(&self, other: &&str) -> bool {
         &**self == *other
     }
 }
 
-impl From<&'static str> for MaybeLazy<str> {
+impl<F: FnOnce() -> String> From<&'static str> for MaybeLazy<str, F> {
     #[inline]
-    fn from(s: &'static str) -> MaybeLazy<str> {
+    fn from(s: &'static str) -> MaybeLazy<str, F> {
         MaybeLazy::borrowed(s)
     }
 }