Fixing stringError to errorString

dysinger · dysinger · commit b745f99cc8b5 · 2017-03-28T12:40:40.000-07:00
diff --git a/src/Stack/Build.hs b/src/Stack/Build.hs
@@ -411,7 +411,7 @@ queryBuildInfo selectors0 =
             _ -> err $ "Cannot apply selector to " ++ show value
       where
         cont = select (front . (sel:)) sels
-        err msg = stringError $ msg ++ ": " ++ show (front [sel])
+        err msg = errorString $ msg ++ ": " ++ show (front [sel])
 
 -- | Get the raw build information object
 rawBuildInfo :: (StackM env m, HasEnvConfig env) => m Value
diff --git a/src/Stack/Config.hs b/src/Stack/Config.hs
@@ -202,10 +202,10 @@ makeConcreteResolver ar = do
             ARLatestNightly -> return $ ResolverSnapshot $ Nightly $ snapshotsNightly snapshots
             ARLatestLTSMajor x ->
                 case IntMap.lookup x $ snapshotsLts snapshots of
-                    Nothing -> stringError $ "No LTS release found with major version " ++ show x
+                    Nothing -> errorString $ "No LTS release found with major version " ++ show x
                     Just y -> return $ ResolverSnapshot $ LTS x y
             ARLatestLTS
-                | IntMap.null $ snapshotsLts snapshots -> stringError "No LTS releases found"
+                | IntMap.null $ snapshotsLts snapshots -> errorString "No LTS releases found"
                 | otherwise ->
                     let (x, y) = IntMap.findMax $ snapshotsLts snapshots
                      in return $ ResolverSnapshot $ LTS x y
diff --git a/src/Stack/Config/Nix.hs b/src/Stack/Config/Nix.hs
@@ -61,7 +61,7 @@ nixCompiler compilerVersion =
                                              (fixMinor (versionText v)))
   in case compilerVersion of
        GhcVersion v -> nixCompilerFromVersion v
-       _ -> stringError "Only GHC is supported by stack --nix"
+       _ -> errorString "Only GHC is supported by stack --nix"
 
 -- Exceptions thown specifically by Stack.Nix
 data StackNixException
diff --git a/src/Stack/ConfigCmd.hs b/src/Stack/ConfigCmd.hs
@@ -70,7 +70,7 @@ cfgCmdSet go cmd = do
                      case mstackYaml of
                          LCSProject stackYaml -> return stackYaml
                          LCSNoProject -> liftM (</> stackDotYaml) (getImplicitGlobalProjectDir conf)
-                         LCSNoConfig -> stringError "config command used when no local configuration available"
+                         LCSNoConfig -> errorString "config command used when no local configuration available"
                  CommandScopeGlobal -> return (configUserConfigPath conf))
     -- We don't need to worry about checking for a valid yaml here
     (config :: Yaml.Object) <-
@@ -96,7 +96,7 @@ cfgCmdSetValue (ConfigCmdSetResolver newResolver) = do
         ResolverSnapshot snapName -> void $ loadMiniBuildPlan snapName
         ResolverCompiler _ -> return ()
         -- TODO: custom snapshot support?  Would need a way to specify on CLI
-        ResolverCustom _ _ -> stringError "'stack config set resolver' does not support custom resolvers"
+        ResolverCustom _ _ -> errorString "'stack config set resolver' does not support custom resolvers"
     return (Yaml.String (resolverName concreteResolver))
 cfgCmdSetValue (ConfigCmdSetSystemGhc _ bool) =
     return (Yaml.Bool bool)
diff --git a/src/Stack/Init.hs b/src/Stack/Init.hs
@@ -328,7 +328,7 @@ getSnapshots' = do
         $logError "    http://docs.haskellstack.org/en/stable/yaml_configuration/"
         $logError ""
         $logError $ "Exception was: " <> T.pack (show e)
-        stringError ""
+        errorString ""
 
 -- | Get the default resolver value
 getDefaultResolver
diff --git a/src/Stack/PackageIndex.hs b/src/Stack/PackageIndex.hs
@@ -301,7 +301,7 @@ updateIndexHackageSecurity
 updateIndexHackageSecurity indexName' url (HackageSecurity keyIds threshold) = do
     baseURI <-
         case parseURI $ T.unpack url of
-            Nothing -> stringError $ "Invalid Hackage Security base URL: " ++ T.unpack url
+            Nothing -> errorString $ "Invalid Hackage Security base URL: " ++ T.unpack url
             Just x -> return x
     manager <- liftIO getGlobalManager
     root <- configPackageIndexRoot indexName'
diff --git a/src/Stack/Setup.hs b/src/Stack/Setup.hs
@@ -1695,13 +1695,13 @@ preferredPlatforms = do
         Cabal.Windows -> return (True, "windows")
         Cabal.OSX -> return (False, "osx")
         Cabal.FreeBSD -> return (False, "freebsd")
-        _ -> stringError $ "Binary upgrade not yet supported on OS: " ++ show os'
+        _ -> errorString $ "Binary upgrade not yet supported on OS: " ++ show os'
     arch <-
       case arch' of
         I386 -> return "i386"
         X86_64 -> return "x86_64"
         Arm -> return "arm"
-        _ -> stringError $ "Binary upgrade not yet supported on arch: " ++ show arch'
+        _ -> errorString $ "Binary upgrade not yet supported on arch: " ++ show arch'
     hasgmp4 <- return False -- FIXME import relevant code from Stack.Setup? checkLib $(mkRelFile "libgmp.so.3")
     let suffixes
           | hasgmp4 = ["-static", "-gmp4", ""]
diff --git a/src/Stack/Types/FlagName.hs b/src/Stack/Types/FlagName.hs
@@ -94,7 +94,7 @@ flagNameParser =
 mkFlagName :: String -> Q Exp
 mkFlagName s =
   case parseFlagNameFromString s of
-    Nothing -> stringError ("Invalid flag name: " ++ show s)
+    Nothing -> errorString ("Invalid flag name: " ++ show s)
     Just pn -> [|pn|]
 
 -- | Convenient way to parse a flag name from a 'Text'.
diff --git a/src/Stack/Types/PackageName.hs b/src/Stack/Types/PackageName.hs
@@ -96,7 +96,7 @@ packageNameParser =
 mkPackageName :: String -> Q Exp
 mkPackageName s =
   case parsePackageNameFromString s of
-    Nothing -> stringError ("Invalid package name: " ++ show s)
+    Nothing -> errorString ("Invalid package name: " ++ show s)
     Just pn -> [|pn|]
 
 -- | Parse a package name from a 'Text'.
diff --git a/src/Stack/Types/TemplateName.hs b/src/Stack/Types/TemplateName.hs
@@ -95,7 +95,7 @@ parseTemplateNameFromString fname =
 mkTemplateName :: String -> Q Exp
 mkTemplateName s =
     case parseTemplateNameFromString s of
-        Left{} -> stringError ("Invalid template name: " ++ show s)
+        Left{} -> errorString ("Invalid template name: " ++ show s)
         Right (TemplateName (T.unpack -> prefix) p) ->
             [|TemplateName (T.pack prefix) $(pn)|]
             where pn =
diff --git a/src/Stack/Types/Version.hs b/src/Stack/Types/Version.hs
@@ -162,7 +162,7 @@ fromCabalVersion (Cabal.Version vs _) =
 mkVersion :: String -> Q Exp
 mkVersion s =
   case parseVersionFromString s of
-    Nothing -> stringError ("Invalid package version: " ++ show s)
+    Nothing -> errorString ("Invalid package version: " ++ show s)
     Just pn -> [|pn|]
 
 -- | Display a version range
