Skip to content

Commit db69d3b

Browse files
authored
Use fourmolu 0.18.0.0 (#41)
1 parent 7f06898 commit db69d3b

File tree

5 files changed

+27
-17
lines changed

5 files changed

+27
-17
lines changed

.github/workflows/fourmolu.yaml

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,5 +4,7 @@ jobs:
44
format:
55
runs-on: ubuntu-latest
66
steps:
7-
- uses: actions/checkout@v3
8-
- uses: fourmolu/fourmolu-action@v6
7+
- uses: actions/checkout@v4
8+
- uses: haskell-actions/run-fourmolu@v11
9+
with:
10+
version: "0.18.0.0"

fourmolu.yaml

Lines changed: 14 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,19 @@
1-
comma-style: leading
1+
indentation: 2
22
function-arrows: leading
3-
haddock-style: single-line
3+
comma-style: leading
44
import-export-style: leading
5-
in-style: left-align
5+
import-grouping: by-scope
66
indent-wheres: true
7-
indentation: 2
8-
let-style: inline
9-
newlines-between-decls: 1
107
record-brace-space: true
8+
newlines-between-decls: 1
9+
haddock-style: single-line
10+
let-style: inline
11+
in-style: no-space
12+
single-constraint-parens: never
13+
single-deriving-parens: never
14+
sort-constraints: true
15+
sort-derived-classes: true
16+
sort-deriving-clauses: true
17+
trailing-section-operators: false
18+
unicode: never
1119
respectful: true

src/Data/Pool.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -70,8 +70,8 @@ takeResource pool = mask_ $ do
7070
then do
7171
q <- newEmptyTMVar
7272
writeTVar (stripeVar lp) $! stripe {queueR = Queue q (queueR stripe)}
73-
pure $
74-
waitForResource (stripeVar lp) q >>= \case
73+
pure
74+
$ waitForResource (stripeVar lp) q >>= \case
7575
Just a -> pure (a, lp)
7676
Nothing -> do
7777
a <- createResource (poolConfig pool) `onException` restoreSize (stripeVar lp)
@@ -133,8 +133,8 @@ takeAvailableResource pool lp stripe = case cache stripe of
133133
a <- createResource (poolConfig pool) `onException` restoreSize (stripeVar lp)
134134
pure (a, lp)
135135
Entry a _ : as -> do
136-
writeTVar (stripeVar lp) $!
137-
stripe
136+
writeTVar (stripeVar lp)
137+
$! stripe
138138
{ available = available stripe - 1
139139
, cache = as
140140
}

src/Data/Pool/Internal.hs

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -164,7 +164,7 @@ newPool pc = do
164164
stripeResources :: Int -> [(Int, Int)]
165165
stripeResources numStripes =
166166
let (base, rest) = quotRem (poolMaxResources pc) numStripes
167-
in zip [1 .. numStripes] $ addRest (replicate numStripes base) rest
167+
in zip [1 .. numStripes] $ addRest (replicate numStripes base) rest
168168
where
169169
addRest [] = error "unreachable"
170170
addRest acc@(r : rs) = \case

src/Data/Pool/Introspection.hs

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -39,15 +39,15 @@ data Resource a = Resource
3939
, acquisitionTime :: !Double
4040
, creationTime :: !(Maybe Double)
4141
}
42-
deriving stock (Eq, Show, Generic)
42+
deriving stock (Eq, Generic, Show)
4343

4444
-- | Describes how a resource was acquired from the pool.
4545
data Acquisition
4646
= -- | A resource was taken from the pool immediately.
4747
Immediate
4848
| -- | The thread had to wait until a resource was released.
4949
Delayed
50-
deriving stock (Eq, Show, Generic)
50+
deriving stock (Eq, Generic, Show)
5151

5252
-- | 'Data.Pool.withResource' with introspection capabilities.
5353
withResource :: Pool a -> (Resource a -> IO r) -> IO r
@@ -68,8 +68,8 @@ takeResource pool = mask_ $ do
6868
then do
6969
q <- newEmptyTMVar
7070
writeTVar (stripeVar lp) $! stripe {queueR = Queue q (queueR stripe)}
71-
pure $
72-
waitForResource (stripeVar lp) q >>= \case
71+
pure
72+
$ waitForResource (stripeVar lp) q >>= \case
7373
Just a -> do
7474
t2 <- getMonotonicTime
7575
let res =

0 commit comments

Comments
 (0)