Restyle pb/action

src/Restyler/App.hs

@@ -110,46 +110,46 @@ instance (MonadUnliftIO m, HasLogger app) => MonadProcess (AppT app m) where
     liftIO $ Process.callProcess cmd args
 
   callProcessExitCode cmd args = do
-    logDebug $
-      "callProcessExitCode"
-        :# ["command" .= cmd, "arguments" .= args]
+    logDebug
+      $ "callProcessExitCode"
+      :# ["command" .= cmd, "arguments" .= args]
     ec <- liftIO $ Process.withCreateProcess proc $ \_ _ _ p ->
       Process.waitForProcess p
-    (if ec == ExitSuccess then logDebug else logWarn) $
-      "callProcessExitCode"
-        :# [ "command" .= cmd
-           , "arguments" .= args
-           , "exitCode" .= exitCodeInt ec
-           ]
+    (if ec == ExitSuccess then logDebug else logWarn)
+      $ "callProcessExitCode"
+      :# [ "command" .= cmd
+         , "arguments" .= args
+         , "exitCode" .= exitCodeInt ec
+         ]
     pure ec
    where
     proc = (Process.proc cmd args) {Process.delegate_ctlc = True}
 
   readProcess cmd args = do
-    logDebug $
-      "readProcess"
-        :# ["command" .= cmd, "arguments" .= args]
+    logDebug
+      $ "readProcess"
+      :# ["command" .= cmd, "arguments" .= args]
     output <- liftIO $ Process.readProcess cmd args ""
-    logDebug $
-      "readProcess"
-        :# [ "command" .= cmd
-           , "arguments" .= args
-           , "output" .= output
-           ]
+    logDebug
+      $ "readProcess"
+      :# [ "command" .= cmd
+         , "arguments" .= args
+         , "output" .= output
+         ]
     pure output
 
   readProcessExitCode cmd args = do
-    logDebug $
-      "readProcess"
-        :# ["command" .= cmd, "arguments" .= args]
+    logDebug
+      $ "readProcess"
+      :# ["command" .= cmd, "arguments" .= args]
     (ec, output, err) <- liftIO $ Process.readProcessWithExitCode cmd args ""
-    (if ec == ExitSuccess then logDebug else logWarn) $
-      "readProcessExitCode"
-        :# [ "command" .= cmd
-           , "arguments" .= args
-           , "output" .= output
-           , "errorOutput" .= err
-           ]
+    (if ec == ExitSuccess then logDebug else logWarn)
+      $ "readProcessExitCode"
+      :# [ "command" .= cmd
+         , "arguments" .= args
+         , "output" .= output
+         , "errorOutput" .= err
+         ]
     pure (ec, output)
 
 instance (MonadUnliftIO m, HasLogger app) => MonadExit (AppT app m) where
@@ -186,9 +186,9 @@ runGitHubInternal
   => GenRequest m k a
   -> n a
 runGitHubInternal req = do
-  logDebug $
-    "runGitHub"
-      :# ["request" .= show @Text (displayGitHubRequest req)]
+  logDebug
+    $ "runGitHub"
+    :# ["request" .= show @Text (displayGitHubRequest req)]
   auth <- OAuth . encodeUtf8 . oAccessToken <$> view optionsL
   result <- liftIO $ do
     mgr <- getGlobalManager

src/Restyler/Config.hs

@@ -220,11 +220,11 @@ loadConfig
      )
   => m Config
 loadConfig =
-  loadConfigFrom (map ConfigPath configPaths) $
-    handleTo ConfigErrorInvalidRestylersYaml
-      . getAllRestylersVersioned
-      . runIdentity
-      . cfRestylersVersion
+  loadConfigFrom (map ConfigPath configPaths)
+    $ handleTo ConfigErrorInvalidRestylersYaml
+    . getAllRestylersVersioned
+    . runIdentity
+    . cfRestylersVersion
 
 loadConfigFrom
   :: (MonadUnliftIO m, MonadSystem m)
@@ -284,10 +284,10 @@ decodeThrow = either throwIO pure . Yaml.decodeThrow
 resolveRestylers :: MonadIO m => ConfigF Identity -> [Restyler] -> m Config
 resolveRestylers ConfigF {..} allRestylers = do
   restylers <-
-    either (throwIO . ConfigErrorInvalidRestylers) pure $
-      overrideRestylers allRestylers $
-        unSketchy $
-          runIdentity cfRestylers
+    either (throwIO . ConfigErrorInvalidRestylers) pure
+      $ overrideRestylers allRestylers
+      $ unSketchy
+      $ runIdentity cfRestylers
 
   pure
     Config

src/Restyler/GHA/Main.hs

@@ -97,17 +97,17 @@ main = do
       for_ results $ \RestylerResult {..} ->
         case rrOutcome of
           ChangesCommitted paths sha -> do
-            logInfo $
-              "Changes committed"
-                :# [ "restyler" .= rName rrRestyler
-                   , "paths" .= paths
-                   , "sha" .= sha
-                   ]
+            logInfo
+              $ "Changes committed"
+              :# [ "restyler" .= rName rrRestyler
+                 , "paths" .= paths
+                 , "sha" .= sha
+                 ]
           x ->
-            logDebug $
-              "Outcome"
-                :# ["restyler" .= rName rrRestyler]
-                <> objectToPairs x
+            logDebug
+              $ "Outcome"
+              :# ["restyler" .= rName rrRestyler]
+              <> objectToPairs x
 
 logExit :: (MonadIO m, MonadLogger m) => SomeException -> m a
 logExit ex = do

src/Restyler/Main.hs

@@ -56,9 +56,9 @@ restylerMain = do
   logInfo "Restyling produced differences"
 
   patch <- getRestyledPatch
-  withThreadContext ["patch" .= True] $
-    traverse_ (logInfo . (:# [])) $
-      T.lines patch
+  withThreadContext ["patch" .= True]
+    $ traverse_ (logInfo . (:# []))
+    $ T.lines patch
 
   -- This message only makes sense in the context of a Job
   for_ mJobUrl $ \jobUrl -> do
@@ -75,20 +75,20 @@ restylerMain = do
       then logWarn "Ignoring auto:true because PR is a fork"
       else do
         logInfo "Pushing changes directly to PR branch"
-        gitPush $
-          unpack $
-            pullRequestLocalHeadRef pullRequest
-              <> ":"
-              <> pullRequestHeadRef pullRequest
+        gitPush
+          $ unpack
+          $ pullRequestLocalHeadRef pullRequest
+          <> ":"
+          <> pullRequestHeadRef pullRequest
         exitWithInfo "Restyling successful"
 
   -- NB there is the edge-case of switching this off mid-PR. A previously
   -- opened Restyle PR would stop updating at that point.
   whenConfig (not . cPullRequests) $ do
     sendPullRequestStatus $ DifferencesStatus mJobUrl
-    logInfo $
-      "Not creating Restyle PR"
-        :# ["reason" .= ("disabled by config" :: Text)]
+    logInfo
+      $ "Not creating Restyle PR"
+      :# ["reason" .= ("disabled by config" :: Text)]
     exitWithInfo "Please correct style using the process described above"
 
   let
@@ -150,8 +150,8 @@ getRestyledPatch = do
 getChangedPaths :: MonadGitHub m => PullRequest -> m [FilePath]
 getChangedPaths pullRequest = do
   files <-
-    runGitHub $
-      pullRequestFilesR
+    runGitHub
+      $ pullRequestFilesR
         (pullRequestOwnerName pullRequest)
         (pullRequestRepoName pullRequest)
         (pullRequestNumber pullRequest)

src/Restyler/Options.hs

@@ -61,16 +61,16 @@ instance HasOptions Options where
   optionsL = id
 
 instance HasManifestOption Options where
-  manifestOptionL = lens (toManifestOption . oManifest) $
-    \x y -> x {oManifest = unManifestOption y}
+  manifestOptionL = lens (toManifestOption . oManifest)
+    $ \x y -> x {oManifest = unManifestOption y}
 
 instance HasHostDirectoryOption Options where
-  hostDirectoryOptionL = lens (toHostDirectoryOption . oHostDirectory) $
-    \x y -> x {oHostDirectory = unHostDirectoryOption y}
+  hostDirectoryOptionL = lens (toHostDirectoryOption . oHostDirectory)
+    $ \x y -> x {oHostDirectory = unHostDirectoryOption y}
 
 instance HasImageCleanupOption Options where
-  imageCleanupOptionL = lens (toImageCleanupOption . oImageCleanup) $
-    \x y -> x {oImageCleanup = unImageCleanupOption y}
+  imageCleanupOptionL = lens (toImageCleanupOption . oImageCleanup)
+    $ \x y -> x {oImageCleanup = unImageCleanupOption y}
 
 instance HasRestrictions Options where
   restrictionsL = lens oRestrictions $ \x y -> x {oRestrictions = y}
@@ -82,11 +82,11 @@ parseOptions :: IO Options
 parseOptions = do
   EnvOptions {..} <- Env.parse id envParser
   CLIOptions {..} <-
-    execParser $
-      info (optionsParser <**> helper) $
-        fullDesc
-          <> progDesc
-            "Restyle a GitHub Pull Request"
+    execParser
+      $ info (optionsParser <**> helper)
+      $ fullDesc
+      <> progDesc
+        "Restyle a GitHub Pull Request"
 
   pure
     Options

src/Restyler/PullRequest/File.hs

@@ -61,13 +61,13 @@
 
 pullRequestFileToChangedPath :: PullRequestFile -> Maybe FilePath
 pullRequestFileToChangedPath file = do
-  guard $
-    file.status
-      `elem` [ PullRequestFileAdded
-             , PullRequestFileCopied
-             , PullRequestFileChanged
-             , PullRequestFileRenamed
-             , PullRequestFileModified
-             ]
+  guard
+    $ file.status
+    `elem` [ PullRequestFileAdded
+           , PullRequestFileCopied
+           , PullRequestFileChanged
+           , PullRequestFileRenamed
+           , PullRequestFileModified
+           ]
 
   pure $ file.filename

src/Restyler/Restrictions.hs

@@ -34,8 +34,8 @@ data Restrictions = Restrictions
 
 restrictionOptions :: Restrictions -> [String]
 restrictionOptions Restrictions {..} =
-  concat $
-    catMaybes
+  concat
+    $ catMaybes
       [ (\b -> if b then ["--net", "none"] else []) <$> getLast netNone
       , (\b -> if b then ["--cap-drop", "all"] else []) <$> getLast capDropAll
       , (\n -> ["--cpu-shares", show n]) <$> getLast cpuShares
@@ -54,26 +54,26 @@ envRestrictions =
 
 parseOverrides :: Env.Parser Env.Error Restrictions
 parseOverrides =
-  Env.prefixed "RESTYLER_" $
-    Restrictions
-      <$> ( fmap not
-              <$> lastSwitch
-                "NO_NET_NONE"
-                "Run restylers without --net=none"
-          )
-      <*> ( fmap not
-              <$> lastSwitch
-                "NO_CAP_DROP_ALL"
-                "Run restylers without --cap-drop=all"
-          )
-      <*> lastReader
-        readNat
-        "CPU_SHARES"
-        "Run restylers with --cpu-shares=<number>"
-      <*> lastReader
-        readBytes
-        "MEMORY"
-        "Run restylers with --memory=<number>[b|k|m|g]"
+  Env.prefixed "RESTYLER_"
+    $ Restrictions
+    <$> ( fmap not
+            <$> lastSwitch
+              "NO_NET_NONE"
+              "Run restylers without --net=none"
+        )
+    <*> ( fmap not
+            <$> lastSwitch
+              "NO_CAP_DROP_ALL"
+              "Run restylers without --cap-drop=all"
+        )
+    <*> lastReader
+      readNat
+      "CPU_SHARES"
+      "Run restylers with --cpu-shares=<number>"
+    <*> lastReader
+      readBytes
+      "MEMORY"
+      "Run restylers with --memory=<number>[b|k|m|g]"
  where
   lastSwitch
     :: String