Rename ReadProcessException constructor to ProcessFailed

sjakobi · sjakobi · commit 7a5408536126 · 2016-09-22T11:53:33.000+02:00
The `ReadProcessException` constructor of the type with the same name
suggested that it is the only constructor of that type. Renaming it fixes
that.
diff --git a/src/Stack/Build/Execute.hs b/src/Stack/Build/Execute.hs
@@ -1093,7 +1093,7 @@ singleBuild runInBase ac@ActionContext {..} ee@ExecuteEnv {..} task@Task {..} in
                         , packageIdentifierString taskProvides
                         ])
                     (\ex -> case ex of
-                        ReadProcessException{} -> return ()
+                        ProcessFailed{} -> return ()
                         _ -> throwM ex)
 
                 readProcessNull Nothing menv' ghcPkgExe
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -599,7 +599,7 @@ resolvePackageLocation menv projRoot (PLRemote url remotePackageType) = do
             return dir
           where
             handleError = handle $ \case
-                ReadProcessException{} -> do
+                ProcessFailed{} -> do
                     $logInfo $ "Failed to reset to commit " <> commit <> ", deleting and re-cloning."
                     ignoringAbsence (removeDirRecur dir)
                     doClone
@@ -621,7 +621,7 @@ resolvePackageLocation menv projRoot (PLRemote url remotePackageType) = do
                 readProcessNull (Just dir) menv commandName
                     (resetCommand ++ [T.unpack commit, "--"])
                     `catch` \case
-                        ex@ReadProcessException{} -> do
+                        ex@ProcessFailed{} -> do
                             unless firstTry $ $logInfo $
                                 "Please ensure that commit " <> commit <> " exists within " <> url
                             throwM ex
diff --git a/src/Stack/Docker.hs b/src/Stack/Docker.hs
@@ -481,7 +481,7 @@ cleanup opts =
                         | otherwise -> throwM (InvalidCleanupCommandException line)
              e <- try (readDockerProcess envOverride args)
              case e of
-               Left ex@ReadProcessException{} ->
+               Left ex@ProcessFailed{} ->
                  $logError (concatT ["Could not remove: '",v,"': ", show ex])
                Left e' -> throwM e'
                Right _ -> return ()
@@ -662,7 +662,7 @@ inspects envOverride images =
          case eitherDecode (LBS.pack (filter isAscii (decodeUtf8 inspectOut))) of
            Left msg -> throwM (InvalidInspectOutputException msg)
            Right results -> return (Map.fromList (map (\r -> (iiId r,r)) results))
-       Left (ReadProcessException _ _ _ err)
+       Left (ProcessFailed _ _ _ err)
          | "Error: No such image" `LBS.isPrefixOf` err -> return Map.empty
        Left e -> throwM e
 
diff --git a/src/Stack/PackageIndex.hs b/src/Stack/PackageIndex.hs
@@ -255,7 +255,7 @@ updateIndexGit menv indexName' index gitUrl = do
               $logWarn "Shallow package index repo detected, transitioning to a full clone..."
               let handleUnshallowError =
                     C.handle $ \case
-                      ReadProcessException{} -> do
+                      ProcessFailed{} -> do
                         $logInfo $ "Failed to convert to full clone, deleting and re-cloning."
                         ignoringAbsence (removeDirRecur acfDir)
                         doClone
@@ -280,7 +280,7 @@ updateIndexGit menv indexName' index gitUrl = do
                      Left ex -> do
                          $logError (T.pack (show ex))
                          case ex of
-                             ReadProcessException{} -> $logError $ T.unlines
+                             ProcessFailed{} -> $logError $ T.unlines
                                  ["Signature verification failed. "
                                  ,"Please ensure you've set up your"
                                  ,"GPG keychain to accept the D6CF60FD signing key."
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -1110,9 +1110,9 @@ ensureGhcjsBooted menv cv shouldBoot  = do
     eres <- try $ sinkProcessStdout Nothing menv "ghcjs" [] (return ())
     case eres of
         Right () -> return ()
-        Left (ReadProcessException _ _ _ err) | "no input files" `S.isInfixOf` LBS.toStrict err ->
+        Left (ProcessFailed _ _ _ err) | "no input files" `S.isInfixOf` LBS.toStrict err ->
             return ()
-        Left (ReadProcessException _ _ _ err) | "ghcjs_boot.completed" `S.isInfixOf` LBS.toStrict err ->
+        Left (ProcessFailed _ _ _ err) | "ghcjs_boot.completed" `S.isInfixOf` LBS.toStrict err ->
             if not shouldBoot then throwM GHCJSNotBooted else do
                 config <- asks getConfig
                 destDir <- installDir (configLocalPrograms config) (ToolGhcjs cv)
diff --git a/src/Stack/Solver.hs b/src/Stack/Solver.hs
@@ -130,7 +130,7 @@ cabalSolver menv cabalfps constraintType
 
     catch (liftM Right (readProcessStdout (Just tmpdir) menv "cabal" args))
           (\ex -> case ex of
-              ReadProcessException _ _ _ err -> return $ Left err
+              ProcessFailed _ _ _ err -> return $ Left err
               _ -> throwM ex)
     >>= either parseCabalErrors parseCabalOutput
 
diff --git a/src/System/Process/Read.hs b/src/System/Process/Read.hs
@@ -207,13 +207,14 @@ readProcessStderrStdout wd menv name args = do
 
 -- | An exception while trying to read from process.
 data ReadProcessException
-    = ReadProcessException CreateProcess ExitCode L.ByteString L.ByteString
+    = ProcessFailed CreateProcess ExitCode L.ByteString L.ByteString
+    -- ^ @'ProcessFailed' createProcess exitCode stdout stderr@
     | NoPathFound
     | ExecutableNotFound String [FilePath]
     | ExecutableNotFoundAt FilePath
     deriving Typeable
 instance Show ReadProcessException where
-    show (ReadProcessException cp ec out err) = concat $
+    show (ProcessFailed cp ec out err) = concat $
         [ "Running "
         , showSpec $ cmdspec cp] ++
         maybe [] (\x -> [" in directory ", x]) (cwd cp) ++
@@ -271,7 +272,7 @@ sinkProcessStdout wd menv name args sinkStdout = do
           (\(ProcessExitedUnsuccessfully cp ec) ->
                do stderrBuilder <- liftIO (readIORef stderrBuffer)
                   stdoutBuilder <- liftIO (readIORef stdoutBuffer)
-                  throwM $ ReadProcessException
+                  throwM $ ProcessFailed
                     cp
                     ec
                     (toLazyByteString stdoutBuilder)
