Format files

edmundnoble · Apr 7, 2024 · be2695f · be2695f
1 parent 5f90c11
commit be2695f
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 42 deletions.
diff --git a/Cabal/src/Distribution/Simple/Glob/Internal.hs b/Cabal/src/Distribution/Simple/Glob/Internal.hs
@@ -457,8 +457,8 @@ checkNameMatches spec glob candidate
       -- if multidot is supported, then this is a clean match
       if enableMultidot spec
         then pure (GlobMatch ())
-        else -- if not, issue a warning saying multidot is needed for the match
 
+        else -- if not, issue a warning saying multidot is needed for the match
           let (_, candidateExts) = splitExtensions $ takeFileName candidate
               extractExts :: GlobPieces -> Maybe String
               extractExts [] = Nothing

diff --git a/cabal-install/src/Distribution/Client/FileMonitor.hs b/cabal-install/src/Distribution/Client/FileMonitor.hs
@@ -286,9 +286,9 @@ instance Structured MonitorStateGlobRel
 -- direction by just forgetting the extra info.
 reconstructMonitorFilePaths :: MonitorStateFileSet -> Set MonitorFilePath
 reconstructMonitorFilePaths (MonitorStateFileSet singlePaths globPaths) =
-  Set.fromList
-    $ map getSinglePath (Set.toList singlePaths)
-    <> map getGlobPath (Set.toList globPaths)
+  Set.fromList $
+    map getSinglePath (Set.toList singlePaths)
+      <> map getGlobPath (Set.toList globPaths)
   where
     getSinglePath :: MonitorStateFile -> MonitorFilePath
     getSinglePath (MonitorStateFile kindfile kinddir filepath _) =
@@ -576,10 +576,11 @@ probeFileSystem root (MonitorStateFileSet singlePaths globPaths) =
       ]
     -- The glob monitors can require state changes
     globPaths' <-
-      Set.fromList <$> sequence
-        [ probeMonitorStateGlob root globPath
-        | globPath <- Set.toList globPaths
-        ]
+      Set.fromList
+        <$> sequence
+          [ probeMonitorStateGlob root globPath
+          | globPath <- Set.toList globPaths
+          ]
     return (MonitorStateFileSet singlePaths globPaths')
 
 -----------------------------------------------

diff --git a/cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs b/cabal-install/src/Distribution/Client/ProjectBuilding/UnpackedPackage.hs
@@ -473,7 +473,8 @@ buildInplaceUnpackedPackage
 
             let listSimple =
                   execRebuild srcdir (needElaboratedConfiguredPackage pkg)
-                listSdist = fmap (Set.fromList . map monitorFileHashed) $
+                listSdist =
+                  fmap (Set.fromList . map monitorFileHashed) $
                     allPackageSourceFiles verbosity srcdir
                 ifNullThen m m' = do
                   xs <- m
@@ -500,12 +501,12 @@ buildInplaceUnpackedPackage
 
             let dep_monitors =
                   Set.fromList $
-                  map monitorFileHashed $
-                    elabInplaceDependencyBuildCacheFiles
-                      distDirLayout
-                      pkgshared
-                      plan
-                      pkg
+                    map monitorFileHashed $
+                      elabInplaceDependencyBuildCacheFiles
+                        distDirLayout
+                        pkgshared
+                        plan
+                        pkg
             updatePackageBuildFileMonitor
               packageFileMonitor
               srcdir

diff --git a/cabal-install/src/Distribution/Client/ProjectPlanning.hs b/cabal-install/src/Distribution/Client/ProjectPlanning.hs
@@ -1165,11 +1165,11 @@ getPackageSourceHashes verbosity withRepoCtx solverPlan = do
             return (pkgid, srchash)
           | (pkgid, tarball) <- allTarballFilePkgs
           ]
-  monitorFiles
-    $ Set.fromList
-    [ monitorFile tarball
-    | (_pkgid, tarball) <- allTarballFilePkgs
-    ]
+  monitorFiles $
+    Set.fromList
+      [ monitorFile tarball
+      | (_pkgid, tarball) <- allTarballFilePkgs
+      ]
 
   -- Return the combination
   return $!

diff --git a/cabal-install/src/Distribution/Client/RebuildMonad.hs b/cabal-install/src/Distribution/Client/RebuildMonad.hs
@@ -257,12 +257,12 @@ createDirectoryMonitored createParents dir = do
 monitorDirectoryStatus :: FilePath -> Rebuild Bool
 monitorDirectoryStatus dir = do
   exists <- liftIO $ doesDirectoryExist dir
-  monitorFiles
-    $ Set.singleton
-    ( if exists
-        then monitorDirectory dir
-        else monitorNonExistentDirectory dir
-    )
+  monitorFiles $
+    Set.singleton
+      ( if exists
+          then monitorDirectory dir
+          else monitorNonExistentDirectory dir
+      )
   return exists
 
 -- | Like 'doesFileExist', but in the 'Rebuild' monad.  This does
@@ -271,12 +271,12 @@ doesFileExistMonitored :: FilePath -> Rebuild Bool
 doesFileExistMonitored f = do
   root <- askRoot
   exists <- liftIO $ doesFileExist (root </> f)
-  monitorFiles
-    $ Set.singleton
-    ( if exists
-        then monitorFileExistence f
-        else monitorNonExistentFile f
-    )
+  monitorFiles $
+    Set.singleton
+      ( if exists
+          then monitorFileExistence f
+          else monitorNonExistentFile f
+      )
   return exists
 
 -- | Monitor a single file
@@ -292,12 +292,12 @@ needIfExists :: FilePath -> Rebuild ()
 needIfExists f = do
   root <- askRoot
   exists <- liftIO $ doesFileExist (root </> f)
-  monitorFiles
-    $ Set.singleton
-    ( if exists
-        then monitorFileHashed f
-        else monitorNonExistentFile f
-    )
+  monitorFiles $
+    Set.singleton
+      ( if exists
+          then monitorFileHashed f
+          else monitorNonExistentFile f
+      )
 
 -- | Like 'findFileWithExtension', but in the 'Rebuild' monad.
 findFileWithExtensionMonitored

diff --git a/cabal-install/tests/UnitTests/Distribution/Client/FileMonitor.hs b/cabal-install/tests/UnitTests/Distribution/Client/FileMonitor.hs
@@ -450,10 +450,11 @@ testMultipleMonitorKinds mtimeChange =
     updateMonitor
       root
       monitor
-      (Set.fromList
-      [ monitorDirectory "dir"
-      , monitorDirectoryExistence "dir"
-      ])
+      ( Set.fromList
+          [ monitorDirectory "dir"
+          , monitorDirectoryExistence "dir"
+          ]
+      )
       ()
       ()
     (res2, files2) <- expectMonitorUnchanged root monitor ()