Skip to content

Commit d938d6a

Browse files
committed
format
1 parent 5fd5ee7 commit d938d6a

File tree

6 files changed

+38
-25
lines changed

6 files changed

+38
-25
lines changed

lib/Data/Time/Clock/Internal/DiffTime.hs

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -84,21 +84,28 @@ instance RealFrac DiffTime where
8484

8585
pattern Picoseconds :: Integer -> DiffTime
8686
pattern Picoseconds a <- (diffTimeToPicoseconds -> a)
87-
where Picoseconds a = picosecondsToDiffTime a
87+
where
88+
Picoseconds a = picosecondsToDiffTime a
89+
8890
{-# COMPLETE Picoseconds #-}
8991

9092
pattern Seconds :: Pico -> DiffTime
9193
pattern Seconds a = MkDiffTime a
94+
9295
{-# COMPLETE Seconds #-}
9396

9497
pattern Minutes :: Pico -> DiffTime
9598
pattern Minutes a <- Seconds ((/ 60) -> a)
96-
where Minutes a = Seconds $ a * 60
99+
where
100+
Minutes a = Seconds $ a * 60
101+
97102
{-# COMPLETE Minutes #-}
98103

99104
pattern Hours :: Pico -> DiffTime
100105
pattern Hours a <- Minutes ((/ 60) -> a)
101-
where Hours a = Minutes $ a * 60
106+
where
107+
Hours a = Minutes $ a * 60
108+
102109
{-# COMPLETE Hours #-}
103110

104111
-- | Create a 'DiffTime' which represents an integral number of seconds.

lib/Data/Time/Clock/Internal/NominalDiffTime.hs

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,12 +15,11 @@ import Data.Fixed
1515
#ifdef __GLASGOW_HASKELL__
1616
import GHC.Read
1717
#endif
18+
import Data.Time.Clock.Internal.DiffTime
1819
import Language.Haskell.TH.Syntax qualified as TH
1920
import Text.ParserCombinators.ReadP
2021
import Text.ParserCombinators.ReadPrec
2122

22-
import Data.Time.Clock.Internal.DiffTime
23-
2423
-- | This is a length of time, as measured by UTC.
2524
-- It has a precision of one picosecond (10^-12 s).
2625
--
@@ -38,8 +37,10 @@ newtype NominalDiffTime
3837

3938
-- | convert from DiffTime
4039
pattern Nominal :: DiffTime -> NominalDiffTime
41-
pattern Nominal dt <- MkNominalDiffTime (realToFrac -> dt) where
42-
Nominal dt = MkNominalDiffTime $ realToFrac dt
40+
pattern Nominal dt <- MkNominalDiffTime (realToFrac -> dt)
41+
where
42+
Nominal dt = MkNominalDiffTime $ realToFrac dt
43+
4344
{-# COMPLETE Nominal #-}
4445

4546
-- | Create a 'NominalDiffTime' from a number of seconds.

lib/Data/Time/LocalTime/Internal/CalendarDiffTime.hs

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,11 +7,11 @@ module Data.Time.LocalTime.Internal.CalendarDiffTime (
77

88
import Control.DeepSeq
99
import Data.Data
10-
import Data.Time.Calendar.Gregorian
1110
import Data.Time.Calendar.CalendarDiffDays
11+
import Data.Time.Calendar.Gregorian
1212
import Data.Time.Clock.Internal.NominalDiffTime
13-
import Data.Time.Clock.Internal.UTCTime
1413
import Data.Time.Clock.Internal.UTCDiff
14+
import Data.Time.Clock.Internal.UTCTime
1515
import GHC.Generics
1616
import Language.Haskell.TH.Syntax qualified as TH
1717

@@ -54,11 +54,13 @@ addUTCDurationRollOver (CalendarDiffTime m d) (UTCTime day t) =
5454
diffUTCDurationClip :: UTCTime -> UTCTime -> CalendarDiffTime
5555
diffUTCDurationClip (UTCTime day1 t1) (UTCTime day2 t2) =
5656
let
57-
CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationClip day1 day2
58-
in CalendarDiffTime m $ t + realToFrac (t1 - t2)
57+
CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationClip day1 day2
58+
in
59+
CalendarDiffTime m $ t + realToFrac (t1 - t2)
5960

6061
diffUTCDurationRollOver :: UTCTime -> UTCTime -> CalendarDiffTime
6162
diffUTCDurationRollOver (UTCTime day1 t1) (UTCTime day2 t2) =
6263
let
63-
CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationRollOver day1 day2
64-
in CalendarDiffTime m $ t + realToFrac (t1 - t2)
64+
CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationRollOver day1 day2
65+
in
66+
CalendarDiffTime m $ t + realToFrac (t1 - t2)

lib/Data/Time/LocalTime/Internal/LocalTime.hs

Lines changed: 7 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -27,9 +27,9 @@ import Data.Time.Clock.Internal.NominalDiffTime
2727
import Data.Time.Clock.Internal.UTCDiff
2828
import Data.Time.Clock.Internal.UTCTime
2929
import Data.Time.Clock.Internal.UniversalTime
30+
import Data.Time.LocalTime.Internal.CalendarDiffTime
3031
import Data.Time.LocalTime.Internal.TimeOfDay
3132
import Data.Time.LocalTime.Internal.TimeZone
32-
import Data.Time.LocalTime.Internal.CalendarDiffTime
3333
import GHC.Generics
3434
import Language.Haskell.TH.Syntax qualified as TH
3535

@@ -98,11 +98,13 @@ addLocalDurationRollOver (CalendarDiffTime m d) (LocalTime day t) =
9898
diffLocalDurationClip :: LocalTime -> LocalTime -> CalendarDiffTime
9999
diffLocalDurationClip (LocalTime day1 t1) (LocalTime day2 t2) =
100100
let
101-
CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationClip day1 day2
102-
in CalendarDiffTime m $ t + diffTimeOfDay t1 t2
101+
CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationClip day1 day2
102+
in
103+
CalendarDiffTime m $ t + diffTimeOfDay t1 t2
103104

104105
diffLocalDurationRollOver :: LocalTime -> LocalTime -> CalendarDiffTime
105106
diffLocalDurationRollOver (LocalTime day1 t1) (LocalTime day2 t2) =
106107
let
107-
CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationRollOver day1 day2
108-
in CalendarDiffTime m $ t + diffTimeOfDay t1 t2
108+
CalendarDiffTime m t = calendarTimeDays $ diffGregorianDurationRollOver day1 day2
109+
in
110+
CalendarDiffTime m $ t + diffTimeOfDay t1 t2

test/main/Test/Clock/Pattern.hs

Lines changed: 7 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
module Test.Clock.Pattern (
2-
testClockPatterns
2+
testClockPatterns,
33
) where
44

55
import Data.Time.Clock
@@ -12,16 +12,17 @@ testClockPatterns =
1212
testSame :: forall a. (Eq a, Show a) => TestName -> a -> a -> TestTree
1313
testSame name expected found = testCase name $ assertEqual "" expected found
1414
in
15-
testGroup "pattern" $
16-
[
17-
testGroup "construct"
15+
testGroup "pattern" $
16+
[ testGroup
17+
"construct"
1818
[ testSame "Seconds" 52.4 (Seconds 52.4)
1919
, testSame "Seconds-Picoseconds" (Picoseconds 7_276_000_000_000) (Seconds 7.276)
2020
, testSame "Minutes-Seconds" (Seconds 210) (Minutes 3.5)
2121
, testSame "Hours-Minutes" (Minutes 120) (Hours 2)
2222
, testSame "Nominal" 37.4 (Nominal 37.4)
23-
],
24-
testGroup "deconstruct"
23+
]
24+
, testGroup
25+
"deconstruct"
2526
[ testSame "Seconds" 52.4 ((\(Seconds x) -> x) 52.4)
2627
, testSame "Seconds-Picoseconds" 7.276 ((\(Seconds x) -> x) $ Picoseconds 7_276_000_000_000)
2728
, testSame "Minutes-Seconds" 3.5 ((\(Minutes x) -> x) $ Seconds 210)

test/unix/Test/Format/Format.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -153,7 +153,7 @@ unixWorkarounds _ s = s
153153
lastM :: [a] -> Maybe a
154154
lastM [] = Nothing
155155
lastM [a] = Just a
156-
lastM (_:aa) = lastM aa
156+
lastM (_ : aa) = lastM aa
157157

158158
compareFormat :: (String -> String) -> String -> TimeZone -> UTCTime -> Result
159159
compareFormat _modUnix fmt zone _time

0 commit comments

Comments
 (0)