diff --git a/yesod-auth/Yesod/Auth/BrowserId.hs b/yesod-auth/Yesod/Auth/BrowserId.hs index 75f1cb57..95d6c7fd 100644 --- a/yesod-auth/Yesod/Auth/BrowserId.hs +++ b/yesod-auth/Yesod/Auth/BrowserId.hs @@ -17,7 +17,6 @@ import Data.Maybe (fromMaybe) import Control.Monad (when) import Control.Exception (throwIO) import Text.Julius (julius, rawJS) -import Data.Aeson (toJSON) import Network.URI (uriPath, parseURI) import Data.FileEmbed (embedFile) import Data.ByteString (ByteString) diff --git a/yesod-core/Yesod/Core/Json.hs b/yesod-core/Yesod/Core/Json.hs index ce9ef337..94fcbcfb 100644 --- a/yesod-core/Yesod/Core/Json.hs +++ b/yesod-core/Yesod/Core/Json.hs @@ -11,9 +11,12 @@ module Yesod.Core.Json -- * Produce JSON values , J.Value (..) + , J.ToJSON (..) + , J.FromJSON (..) , array , object , (.=) + , (J..:) -- * Convenience functions , jsonOrRedirect diff --git a/yesod-form/Yesod/Form/Jquery.hs b/yesod-form/Yesod/Form/Jquery.hs index d56573d8..7ddeff47 100644 --- a/yesod-form/Yesod/Form/Jquery.hs +++ b/yesod-form/Yesod/Form/Jquery.hs @@ -20,7 +20,6 @@ import Text.Hamlet (shamlet) import Text.Julius (julius, rawJS) import Data.Text (Text, pack, unpack) import Data.Monoid (mconcat) -import Data.Aeson (toJSON) -- | Gets the Google hosted jQuery UI 1.8 CSS file with the given theme. googleHostedJqueryUiCss :: Text -> Text diff --git a/yesod/Yesod.hs b/yesod/Yesod.hs index 2ee9080d..16c6eb1e 100644 --- a/yesod/Yesod.hs +++ b/yesod/Yesod.hs @@ -20,7 +20,6 @@ module Yesod , julius , JavascriptUrl , renderJavascriptUrl - , toJSON -- ** Cassius/Lucius , cassius , lucius @@ -38,7 +37,6 @@ import Yesod.Form import Yesod.Persist import Network.Wai -import Data.Aeson (toJSON) showIntegral :: Integral a => a -> String showIntegral x = show (fromIntegral x :: Integer)