on master help sign in
compatibility with older base
41ac823Leonid Onokhov
katip/src/Katip/Format/Time.hs+7−7
@@ -33,7 +33,7 @@ formatAsLogTime (UTCTime day time) = toText $ TA.run2 $ do
33 _ <- writeDay buf 0 day
33 _ <- writeDay buf 0 day
34 TA.unsafeWrite buf 10 0x20 -- space
34 TA.unsafeWrite buf 10 0x20 -- space
35 _ <- writeTimeOfDay False buf 11 (diffTimeOfDay64 time)
35 _ <- writeTimeOfDay False buf 11 (diffTimeOfDay64 time)
36− pure (buf, 19)
36+ return (buf, 19)
37 where
37 where
38 toText (arr, len) = Text arr 0 len
38 toText (arr, len) = Text arr 0 len
39
39
@@ -60,7 +60,7 @@ formatAsIso8601 (UTCTime day time) = toText $ TA.run2 $ do
60 TA.unsafeWrite buf 10 0x54 -- T
60 TA.unsafeWrite buf 10 0x54 -- T
61 next <- writeTimeOfDay True buf 11 (diffTimeOfDay64 time)
61 next <- writeTimeOfDay True buf 11 (diffTimeOfDay64 time)
62 TA.unsafeWrite buf next 0x5A -- Z
62 TA.unsafeWrite buf next 0x5A -- Z
63− pure (buf, next+1)
63+ return (buf, next+1)
64 where
64 where
65 toText (arr, len) = Text arr 0 len
65 toText (arr, len) = Text arr 0 len
66
66
@@ -80,7 +80,7 @@ writeDay buf off day =
80 TA.unsafeWrite buf (off + 7) 0x2d -- dash
80 TA.unsafeWrite buf (off + 7) 0x2d -- dash
81 TA.unsafeWrite buf (off + 8) d1
81 TA.unsafeWrite buf (off + 8) d1
82 TA.unsafeWrite buf (off + 9) d2
82 TA.unsafeWrite buf (off + 9) d2
83− pure (off + 10)
83+ return (off + 10)
84 where
84 where
85 (yr,m,d) = toGregorian day
85 (yr,m,d) = toGregorian day
86 (y1, ya) = fromIntegral (abs yr) `quotRem` 1000
86 (y1, ya) = fromIntegral (abs yr) `quotRem` 1000
@@ -105,7 +105,7 @@ writeTimeOfDay doSubSeconds buf off (TOD hh mm ss) =
105 TA.unsafeWrite buf (off + 7) s2
105 TA.unsafeWrite buf (off + 7) s2
106 if doSubSeconds && frac /= 0
106 if doSubSeconds && frac /= 0
107 then writeFracSeconds buf (off + 8) frac
107 then writeFracSeconds buf (off + 8) frac
108− else pure (off + 8)
108+ else return (off + 8)
109 where
109 where
110 T h1 h2 = twoDigits hh
110 T h1 h2 = twoDigits hh
111 T m1 m2 = twoDigits mm
111 T m1 m2 = twoDigits mm
@@ -169,17 +169,17 @@ writeTrunc3 :: TA.MArray s -> Int -> Int -> ST s Int
169writeTrunc3 buf off i
169writeTrunc3 buf off i
170 | d == 0 = do
170 | d == 0 = do
171 TA.unsafeWrite buf off (digit d1)
171 TA.unsafeWrite buf off (digit d1)
172− pure (off+1)
172+ return (off+1)
173 | d3 == 0 = do
173 | d3 == 0 = do
174 TA.unsafeWrite buf off (digit d1)
174 TA.unsafeWrite buf off (digit d1)
175 TA.unsafeWrite buf (off+1) (digit d2)
175 TA.unsafeWrite buf (off+1) (digit d2)
176− pure (off+2)
176+ return (off+2)
177
177
178 | otherwise = do
178 | otherwise = do
179 TA.unsafeWrite buf off (digit d1)
179 TA.unsafeWrite buf off (digit d1)
180 TA.unsafeWrite buf (off+1) (digit d2)
180 TA.unsafeWrite buf (off+1) (digit d2)
181 TA.unsafeWrite buf (off+2) (digit d3)
181 TA.unsafeWrite buf (off+2) (digit d3)
182− pure (off+3)
182+ return (off+3)
183 where
183 where
184 (d1, d) = i `quotRem` 100
184 (d1, d) = i `quotRem` 100
185 (d2, d3) = d `quotRem` 10
185 (d2, d3) = d `quotRem` 10