Updates from new ormolu 0.4 (#167)

* Changes from formatter

* Fix github action run on master branch

.github/workflows/ci.yml

@@ -1,6 +1,6 @@
 name: CI
 
-# Trigger the workflow on push or pull request, but only for the main branch
+# Trigger the workflow on push or pull request, but only for the master branch
 on:
   pull_request:
     branches: [master]
@@ -45,7 +45,7 @@ jobs:
 
     steps:
     - uses: actions/checkout@v2
-      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/main'
+      if: github.event.action == 'opened' || github.event.action == 'synchronize' || github.event.ref == 'refs/heads/master'
 
     - uses: haskell/actions/setup@v1
       id: setup-haskell-cabal

src/Network/Minio/SelectAPI.hs

@@ -186,7 +186,7 @@ crcCheck = do
   -- 12 bytes have been read off the current message. Now read the
   -- next (n-12)-4 bytes and accumulate the checksum, and yield it.
   let startCrc = crc32 b
-  finalCrc <- accumulateYield (fromIntegral n -16) startCrc
+  finalCrc <- accumulateYield (fromIntegral n - 16) startCrc
 
   bs <- readNBytes 4
   expectedCrc :: Word32 <- liftIO $ parseBinary bs
@@ -276,7 +276,7 @@ selectObjectContent b o r = do
             riNeedsLocation = False,
             riQueryParams = [("select", Nothing), ("select-type", Just "2")]
           }
-  --print $ mkSelectRequest r
+  -- print $ mkSelectRequest r
   resp <- mkStreamRequest reqInfo
   return $ NC.responseBody resp .| selectProtoConduit
 

src/Network/Minio/Sign/V4.hs

@@ -376,7 +376,7 @@ signV4Stream !payloadLength !sp !req =
                         <> bs
                         <> "\r\n"
                 C.yield chunkBS
-              signerConduit (n -1) lps nextSign
+                signerConduit (n - 1) lps nextSign
 
             -- Second case encodes the last chunk which is smaller than
             -- 'chunkSizeConstant'

src/Network/Minio/Utils.hs

@@ -235,7 +235,7 @@ limitedMapConcurrently count act args = do
     waitSem t = U.atomically $ do
       v <- U.readTVar t
       if v > 0
-        then U.writeTVar t (v -1)
+        then U.writeTVar t (v - 1)
         else U.retrySTM
     signalSem t = U.atomically $ do
       v <- U.readTVar t

test/LiveServer.hs

@@ -1076,7 +1076,7 @@ copyObjectTests = funTestWithBucket "copyObject related tests" $
         copyObjectPart
           dstInfo'
           srcInfo'
-            { srcRange = Just $ (,) ((p -1) * mb5) ((p -1) * mb5 + (mb5 - 1))
+            { srcRange = Just $ (,) ((p - 1) * mb5) ((p - 1) * mb5 + (mb5 - 1))
             }
           uid
           (fromIntegral p)