Make changes required by new Ormolu version

vehicle-lang · Oct 12, 2024 · 8a13021 · 8a13021
1 parent 4cc5bd7
commit 8a13021
Show file tree

Hide file tree

Showing 7 changed files with 11 additions and 15 deletions.
diff --git a/tasty-golden-executable/src/Test/Tasty/Golden/Executable.hs b/tasty-golden-executable/src/Test/Tasty/Golden/Executable.hs
@@ -33,7 +33,7 @@ makeTestTreeFromFile testOptions testSpecFile = do
   TestSpecs testSpecs <- readTestSpecsFile testSpecFile
   return
     [ someLocalOptions testOptions (singleTest (testSpecName testSpec) testSpec)
-      | testSpec <- NonEmpty.toList testSpecs
+    | testSpec <- NonEmpty.toList testSpecs
     ]
 
 -- | Create a test tree from all test specifications in a directory, recursively.

diff --git a/tasty-golden-executable/src/Test/Tasty/Golden/Executable/Runner.hs b/tasty-golden-executable/src/Test/Tasty/Golden/Executable/Runner.hs
@@ -398,8 +398,8 @@ acceptTestProduced testProduces (IgnoreFiles testIgnores) = do
         oldTestSpecProduces <- testSpecProduces . acceptTestSpec <$> get
         let newTestSpecProduces =
               [ testSpecProducesPattern
-                | testSpecProducesPattern <- oldTestSpecProduces,
-                  any (testSpecProducesPattern `match`) actualFiles
+              | testSpecProducesPattern <- oldTestSpecProduces,
+                any (testSpecProducesPattern `match`) actualFiles
               ]
         modify $ \acceptState@AcceptState {..} ->
           acceptState {acceptTestSpec = acceptTestSpec {testSpecProduces = newTestSpecProduces}}
@@ -450,9 +450,9 @@ findTestProducesActual testIgnoreFiles = do
   -- Filter out the files copied by 'copyTestNeeds' or matched by 'testIgnoreFiles'.
   let tempFilesProducedAndNotIgnored =
         [ file
-          | file <- tempFiles,
-            file `notElem` testNeeds,
-            and [not (ignore `match` file) | ignore <- testIgnoreFiles]
+        | file <- tempFiles,
+          file `notElem` testNeeds,
+          and [not (ignore `match` file) | ignore <- testIgnoreFiles]
         ]
   return tempFilesProducedAndNotIgnored
 

diff --git a/vehicle/src/Vehicle/Backend/LossFunction/Logics.hs b/vehicle/src/Vehicle/Backend/LossFunction/Logics.hs
@@ -277,8 +277,7 @@ parameterisedYagerTranslation p =
     orOp = mkOp2 tRat $ \x y ->
       ratLit 1
         -: lmin
-          ( ((x ^: p) +: (y ^: p)) ^: (1 / p)
-          )
+          (((x ^: p) +: (y ^: p)) ^: (1 / p))
           (ratLit 1)
 
 --------------------------------------------------------------------------------

diff --git a/vehicle/src/Vehicle/CommandLine.hs b/vehicle/src/Vehicle/CommandLine.hs
@@ -360,8 +360,7 @@ typeSystemParser =
                   <> line
                   <> indent
                     2
-                    ( vsep allTypeSystems
-                    )
+                    (vsep allTypeSystems)
               )
         )
       <> value Standard

diff --git a/vehicle/src/Vehicle/Compile/Print/Error.hs b/vehicle/src/Vehicle/Compile/Print/Error.hs
@@ -318,7 +318,7 @@ instance MeaningfulError CompileError where
         mkRes :: [Endo (DSLExpr builtin)]
         mkRes =
           [ Endo $ \tRes -> pi Nothing (visibilityOf arg) (relevanceOf arg) (tHole ("arg" <> pack (show i))) (const tRes)
-            | (i, arg) <- zip [0 :: Int ..] args
+          | (i, arg) <- zip [0 :: Int ..] args
           ]
 
         expectedType :: Expr builtin

diff --git a/vehicle/src/Vehicle/Compile/Type/Irrelevance.hs b/vehicle/src/Vehicle/Compile/Type/Irrelevance.hs
@@ -31,8 +31,7 @@ removeIrrelevantCode x = runIdentity $ remove x
 -- Remove polarity and linearity annotations
 
 type MonadRemove m =
-  ( Monad m
-  )
+  (Monad m)
 
 class RemoveIrrelevantCode m a where
   remove :: (MonadRemove m) => a -> m a

diff --git a/vehicle/src/Vehicle/Data/Builtin/Linearity/LinearitySolver.hs b/vehicle/src/Vehicle/Data/Builtin/Linearity/LinearitySolver.hs
@@ -39,8 +39,7 @@ solveLinearityConstraint _ (WithContext constraint ctx) = do
 -- Constraint solving
 
 type MonadLinearitySolver m =
-  ( MonadTypeChecker LinearityBuiltin m
-  )
+  (MonadTypeChecker LinearityBuiltin m)
 
 type LinearitySolver =
   forall m.