diff --git a/yesod-form/Yesod/Form/Fields.hs b/yesod-form/Yesod/Form/Fields.hs index 77e09570..3ec98b55 100644 --- a/yesod-form/Yesod/Form/Fields.hs +++ b/yesod-form/Yesod/Form/Fields.hs @@ -52,14 +52,10 @@ import Yesod.Handler (getMessageRender) import Yesod.Widget (toWidget, whamlet, GWidget) import Yesod.Message (RenderMessage (renderMessage), SomeMessage (..)) import Text.Hamlet -#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze (ToMarkup (toMarkup), preEscapedToMarkup, unsafeByteString) #define ToHtml ToMarkup #define toHtml toMarkup #define preEscapedText preEscapedToMarkup -#else -import Text.Blaze (ToHtml (..), preEscapedText, unsafeByteString) -#endif import Text.Cassius import Data.Time (Day, TimeOfDay(..)) import qualified Text.Email.Validate as Email @@ -75,11 +71,7 @@ import Blaze.ByteString.Builder (writeByteString, toLazyByteString) import Blaze.ByteString.Builder.Internal.Write (fromWriteList) import Database.Persist.Store (PersistEntityBackend) -#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze.Html.Renderer.String (renderHtml) -#else -import Text.Blaze.Renderer.String (renderHtml) -#endif import qualified Data.ByteString as S import qualified Data.ByteString.Lazy as L import Data.Text (Text, unpack, pack) diff --git a/yesod-form/Yesod/Form/Functions.hs b/yesod-form/Yesod/Form/Functions.hs index 29ffc2b4..ffb0e170 100644 --- a/yesod-form/Yesod/Form/Functions.hs +++ b/yesod-form/Yesod/Form/Functions.hs @@ -47,13 +47,9 @@ import Control.Monad.Trans.RWS (ask, get, put, runRWST, tell, evalRWST) import Control.Monad.Trans.Class (lift) import Control.Monad (liftM, join) import Crypto.Classes (constTimeEq) -#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze (Markup, toMarkup) #define Html Markup #define toHtml toMarkup -#else -import Text.Blaze (Html, toHtml) -#endif import Yesod.Handler (GHandler, getRequest, runRequestBody, newIdent, getYesod) import Yesod.Core (RenderMessage, SomeMessage (..)) import Yesod.Widget (GWidget, whamlet) diff --git a/yesod-form/Yesod/Form/MassInput.hs b/yesod-form/Yesod/Form/MassInput.hs index ece14a58..62e89d68 100644 --- a/yesod-form/Yesod/Form/MassInput.hs +++ b/yesod-form/Yesod/Form/MassInput.hs @@ -15,11 +15,7 @@ import Yesod.Form.Fields (boolField) import Yesod.Widget (GWidget, whamlet) import Yesod.Message (RenderMessage) import Yesod.Handler (newIdent, GHandler) -#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze.Html (Html) -#else -import Text.Blaze (Html) -#endif import Control.Monad.Trans.Class (lift) import Control.Monad.Trans.RWS (get, put, ask) import Data.Maybe (fromMaybe) diff --git a/yesod-form/Yesod/Form/Types.hs b/yesod-form/Yesod/Form/Types.hs index d444166b..c4e03164 100644 --- a/yesod-form/Yesod/Form/Types.hs +++ b/yesod-form/Yesod/Form/Types.hs @@ -23,14 +23,10 @@ import Control.Monad.Trans.RWS (RWST) import Yesod.Request (FileInfo) import Data.Text (Text) import Data.Monoid (Monoid (..)) -#if MIN_VERSION_blaze_html(0, 5, 0) import Text.Blaze (Markup, ToMarkup (toMarkup)) #define Html Markup #define ToHtml ToMarkup #define toHtml toMarkup -#else -import Text.Blaze (Html, ToHtml (toHtml)) -#endif import Control.Applicative ((<$>), Applicative (..)) import Control.Monad (liftM) import Data.String (IsString (..))