diff --git a/IHP/AuthSupport/Authorization.hs b/IHP/AuthSupport/Authorization.hs index 8d9a8eedf..c3798d6eb 100644 --- a/IHP/AuthSupport/Authorization.hs +++ b/IHP/AuthSupport/Authorization.hs @@ -6,7 +6,6 @@ Copyright: (c) digitally induced GmbH, 2020 module IHP.AuthSupport.Authorization where import IHP.Prelude -import Control.Monad.Fail (fail) class CanView user model where canView :: (?modelContext :: ModelContext) => model -> user -> IO Bool diff --git a/IHP/IDE/CodeGen/ControllerGenerator.hs b/IHP/IDE/CodeGen/ControllerGenerator.hs index f724826c7..cb1f1b477 100644 --- a/IHP/IDE/CodeGen/ControllerGenerator.hs +++ b/IHP/IDE/CodeGen/ControllerGenerator.hs @@ -11,7 +11,6 @@ import qualified Data.Char as Char import qualified IHP.IDE.SchemaDesigner.Parser as SchemaDesigner import IHP.IDE.SchemaDesigner.Types import qualified System.Posix.Env.ByteString as Posix -import Control.Monad.Fail import IHP.IDE.CodeGen.Types import qualified IHP.IDE.CodeGen.ViewGenerator as ViewGenerator diff --git a/IHP/LoginSupport/Helper/Controller.hs b/IHP/LoginSupport/Helper/Controller.hs index e9d9d0f2e..ba22ed28f 100644 --- a/IHP/LoginSupport/Helper/Controller.hs +++ b/IHP/LoginSupport/Helper/Controller.hs @@ -31,7 +31,6 @@ import qualified IHP.ModelSupport as ModelSupport import IHP.ControllerSupport import IHP.FrameworkConfig import System.IO.Unsafe (unsafePerformIO) -import Control.Monad.Fail import IHP.AuthSupport.Authorization import IHP.AuthSupport.Authentication import IHP.Controller.Context diff --git a/IHP/Prelude.hs b/IHP/Prelude.hs index db3b20d88..e5edae4d9 100644 --- a/IHP/Prelude.hs +++ b/IHP/Prelude.hs @@ -37,6 +37,7 @@ module IHP.Prelude , module Data.Time.Format , null , module Control.Exception +, module Control.Monad.Fail ) where @@ -69,6 +70,7 @@ import Database.PostgreSQL.Simple (FromRow) import Data.IORef import Data.Time.Format import Control.Exception (throw, throwIO, catch) +import Control.Monad.Fail (fail) -- Alias for haskell newcomers :) a ++ b = a <> b diff --git a/exe/IHP/CLI/DeleteController.hs b/exe/IHP/CLI/DeleteController.hs index f10eecbf8..7ccf376d7 100644 --- a/exe/IHP/CLI/DeleteController.hs +++ b/exe/IHP/CLI/DeleteController.hs @@ -1,10 +1,8 @@ module Main where -import ClassyPrelude -import Data.String.Conversions (cs) +import IHP.Prelude import qualified System.Directory as Directory import qualified System.Posix.Env.ByteString as Posix -import Control.Monad.Fail import IHP.IDE.CodeGen.ControllerGenerator import IHP.IDE.CodeGen.Controller (undoPlan) import qualified Data.Text as Text diff --git a/exe/IHP/CLI/NewApplication.hs b/exe/IHP/CLI/NewApplication.hs index e91c3bc2b..e473c8d81 100644 --- a/exe/IHP/CLI/NewApplication.hs +++ b/exe/IHP/CLI/NewApplication.hs @@ -1,10 +1,8 @@ module Main where -import ClassyPrelude -import Data.String.Conversions (cs) +import IHP.Prelude import qualified System.Directory as Directory import qualified System.Posix.Env.ByteString as Posix -import Control.Monad.Fail import IHP.IDE.CodeGen.ApplicationGenerator import IHP.IDE.CodeGen.Controller (executePlan) diff --git a/exe/IHP/CLI/NewController.hs b/exe/IHP/CLI/NewController.hs index 5d341ad88..7a1bc25e2 100644 --- a/exe/IHP/CLI/NewController.hs +++ b/exe/IHP/CLI/NewController.hs @@ -1,10 +1,8 @@ module Main where -import ClassyPrelude -import Data.String.Conversions (cs) +import IHP.Prelude import qualified System.Directory as Directory import qualified System.Posix.Env.ByteString as Posix -import Control.Monad.Fail import IHP.IDE.CodeGen.ControllerGenerator import IHP.IDE.CodeGen.Controller (executePlan) import qualified Data.Text as Text diff --git a/exe/IHP/CLI/NewMigration.hs b/exe/IHP/CLI/NewMigration.hs index fe1879696..5d7896e5e 100644 --- a/exe/IHP/CLI/NewMigration.hs +++ b/exe/IHP/CLI/NewMigration.hs @@ -4,7 +4,6 @@ import IHP.Prelude import IHP.SchemaMigration import qualified System.Posix.Env.ByteString as Posix import qualified System.Directory as Directory -import Control.Monad.Fail import IHP.IDE.ToolServer.Helper.Controller (openEditor) main :: IO () diff --git a/exe/IHP/CLI/NewScript.hs b/exe/IHP/CLI/NewScript.hs index e903c3795..0c15689b9 100644 --- a/exe/IHP/CLI/NewScript.hs +++ b/exe/IHP/CLI/NewScript.hs @@ -1,7 +1,6 @@ module Main where import IHP.Prelude -import IHP.HaskellSupport import qualified Data.Text as Text import qualified Data.Text.IO as Text import IHP.ViewSupport