refactor

conjure-cp · Mar 25, 2024 · 562ff9e · 562ff9e
1 parent 9b76b02
commit 562ff9e
Showing 1 changed file with 8 additions and 8 deletions.
diff --git a/src/Conjure/UI/MainHelper.hs b/src/Conjure/UI/MainHelper.hs
@@ -800,10 +800,10 @@ savileRowNoParam ui@Solve{..} (modelPath, eprimeModel) = sh $ errExit False $ do
     when (logLevel >= LogDebug) $ do
         liftIO $ putStrLn "Using the following options for Savile Row:"
         liftIO $ putStrLn $ "    savilerow " ++ unwords (map (quoteMultiWord . textToString) srArgs)
-    (stdoutSR, solutions) <- partitionEithers <$> runHandle savilerowScriptName srArgs
-                                (liftIO . srStdoutHandler
-                                    (outBase, modelPath, "<no param file>", ui)
-                                    tr (1::Int))
+    let handler = liftIO . srStdoutHandler
+                    (outBase, modelPath, "<no param file>", ui)
+                    tr (1::Int)
+    (stdoutSR, solutions) <- partitionEithers <$> runHandle savilerowScriptName srArgs handler
     srCleanUp outBase ui (stringToText $ unlines stdoutSR) solutions
 savileRowNoParam _ _ = bug "savileRowNoParam"
 
@@ -841,10 +841,10 @@ savileRowWithParams ui@Solve{..} (modelPath, eprimeModel) (paramPath, essencePar
             when (logLevel >= LogDebug) $ do
                 liftIO $ putStrLn "Using the following options for Savile Row:"
                 liftIO $ putStrLn $ "    savilerow " ++ unwords (map (quoteMultiWord . textToString) srArgs)
-            (stdoutSR, solutions) <- partitionEithers <$> runHandle savilerowScriptName srArgs
-                                        (liftIO . srStdoutHandler
-                                            (outBase, modelPath, paramPath, ui)
-                                            tr (1::Int))
+            let handler = liftIO . srStdoutHandler
+                            (outBase, modelPath, paramPath, ui)
+                            tr (1::Int)
+            (stdoutSR, solutions) <- partitionEithers <$> runHandle savilerowScriptName srArgs handler
             srCleanUp outBase ui (stringToText $ unlines stdoutSR) solutions
 savileRowWithParams _ _ _ = bug "savileRowWithParams"