@@ -1,4 +1,4 @@
1−{-# LANGUAGE CPP #-}
1+{-# LANGUAGE CPP, DerivingStrategies, DeriveAnyClass #-}
22module Data.Time.LocalTime.Short
33 ( ShortZonedTime
44 , shortZonedTime
@@ -43,7 +43,8 @@ import Data.Time.Format.Internal
4343newtype ShortZonedTime
4444 = ShortZonedTime
4545 { unShortZonedTime :: T.ZonedTime
46− } deriving (FormatTime, NFData, Generic, FromJSON, ToJSON)
46+ } deriving stock (Generic)
47+ deriving newtype (FormatTime, NFData, FromJSON, ToJSON)
4748
4849shortZonedLocalDay :: ShortZonedTime -> T.Day
4950shortZonedLocalDay = T.localDay . T.zonedTimeToLocalTime . unShortZonedTime
@@ -69,6 +70,7 @@ shortZonedTime = coerce . clipZonedTime
6970instance ParseTime ShortZonedTime where
7071 buildTime tl ps = shortZonedTime <$> buildTime tl ps
7172#if MIN_VERSION_time(1,9,0)
73+ substituteTimeSpecifier _ = substituteTimeSpecifier (Proxy @T.ZonedTime)
7274 parseTimeSpecifier _ = parseTimeSpecifier (Proxy @T.ZonedTime)
7375#endif
7476
@@ -94,7 +96,9 @@ instance Ord ShortZonedTime where
9496newtype ShortLocalTime
9597 = ShortLocalTime
9698 { unShortLocalTime :: T.LocalTime
97− } deriving (Eq, Ord, FormatTime, NFData, Generic)
99+ } deriving stock (Eq, Ord, Generic)
100+ deriving newtype (FormatTime)
101+ deriving newtype (NFData)
98102
99103instance Binary ShortLocalTime
100104
@@ -109,6 +113,7 @@ shortLocalTime = coerce . clipLocalTime
109113instance ParseTime ShortLocalTime where
110114 buildTime tl ps = shortLocalTime <$> buildTime tl ps
111115#if MIN_VERSION_time(1,9,0)
116+ substituteTimeSpecifier _ = substituteTimeSpecifier (Proxy @T.ZonedTime)
112117 parseTimeSpecifier _ = parseTimeSpecifier (Proxy @T.LocalTime)
113118#endif
114119