From 2cc68e8256debe5756ab52b7464259c7a6082323 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 13 Dec 2010 23:20:44 +0200 Subject: [PATCH] blaze-builder 0.2.1 --- Yesod/Form/Profiles.hs | 5 +++-- Yesod/Json.hs | 3 ++- yesod.cabal | 4 ++-- 3 files changed, 7 insertions(+), 5 deletions(-) diff --git a/Yesod/Form/Profiles.hs b/Yesod/Form/Profiles.hs index 1dd78255..e224e50b 100644 --- a/Yesod/Form/Profiles.hs +++ b/Yesod/Form/Profiles.hs @@ -33,7 +33,8 @@ import Text.HTML.SanitizeXSS (sanitizeBalance) import Control.Monad (when) import qualified Blaze.ByteString.Builder.Html.Utf8 as B -import Blaze.ByteString.Builder (fromWrite4List, writeByteString) +import Blaze.ByteString.Builder (writeByteString) +import Blaze.ByteString.Builder.Internal.Write (fromWriteList) import Yesod.Internal (lbsToChars) @@ -108,7 +109,7 @@ newtype Textarea = Textarea { unTextarea :: String } deriving (Show, Read, Eq, PersistField) instance ToHtml Textarea where toHtml = - Html . fromWrite4List writeHtmlEscapedChar . unTextarea + Html . fromWriteList writeHtmlEscapedChar . unTextarea where -- Taken from blaze-builder and modified with newline handling. writeHtmlEscapedChar '\n' = writeByteString "
" diff --git a/Yesod/Json.hs b/Yesod/Json.hs index 797ad44e..3e96aca3 100644 --- a/Yesod/Json.hs +++ b/Yesod/Json.hs @@ -25,6 +25,7 @@ import Numeric (showHex) import Data.Monoid (Monoid (..)) import Blaze.ByteString.Builder import Blaze.ByteString.Builder.Char.Utf8 (writeChar) +import Blaze.ByteString.Builder.Internal.Write (fromWriteList) #if TEST import Test.Framework (testGroup, Test) @@ -63,7 +64,7 @@ jsonToRepJson = fmap RepJson . jsonToContent jsonScalar :: String -> Json jsonScalar s = Json $ mconcat [ fromByteString "\"" - , fromWrite4List writeJsonChar s + , fromWriteList writeJsonChar s , fromByteString "\"" ] where diff --git a/yesod.cabal b/yesod.cabal index 0293a2e7..adb34e63 100644 --- a/yesod.cabal +++ b/yesod.cabal @@ -1,5 +1,5 @@ name: yesod -version: 0.6.6 +version: 0.6.7 license: BSD3 license-file: LICENSE author: Michael Snoyman @@ -37,7 +37,7 @@ library , template-haskell >= 2.4 && < 2.6 , web-routes-quasi >= 0.6.2 && < 0.7 , hamlet >= 0.5.1 && < 0.7 - , blaze-builder >= 0.2 && < 0.3 + , blaze-builder >= 0.2.1 && < 0.3 , transformers >= 0.2 && < 0.3 , clientsession >= 0.4.0 && < 0.5 , pureMD5 >= 1.1.0.0 && < 2.2