From b784ef935ac9feaff8ab19bdfbb966256fb9e282 Mon Sep 17 00:00:00 2001
From: Michael Snoyman <michael@snoyman.com>
Date: Mon, 25 Jan 2010 00:33:38 +0200
Subject: [PATCH] Merged Yesod.Constants into Yesod.Definitions

---
 Yesod/Constants.hs    | 27 ---------------------------
 Yesod/Definitions.hs  | 13 +++++++++++++
 Yesod/Helpers/Auth.hs |  1 -
 Yesod/Yesod.hs        |  1 -
 yesod.cabal           |  1 -
 5 files changed, 13 insertions(+), 30 deletions(-)
 delete mode 100644 Yesod/Constants.hs

diff --git a/Yesod/Constants.hs b/Yesod/Constants.hs
deleted file mode 100644
index 9879f625..00000000
--- a/Yesod/Constants.hs
+++ /dev/null
@@ -1,27 +0,0 @@
----------------------------------------------------------
---
--- Module        : Yesod.Constants
--- Copyright     : Michael Snoyman
--- License       : BSD3
---
--- Maintainer    : Michael Snoyman <michael@snoyman.com>
--- Stability     : Stable
--- Portability   : portable
---
--- Constants used throughout Yesod.
---
----------------------------------------------------------
-module Yesod.Constants
-    ( authCookieName
-    , authDisplayName
-    , encryptedCookies
-    ) where
-
-authCookieName :: String
-authCookieName = "IDENTIFIER"
-
-authDisplayName :: String
-authDisplayName = "DISPLAY_NAME"
-
-encryptedCookies :: [String]
-encryptedCookies = [authDisplayName, authCookieName]
diff --git a/Yesod/Definitions.hs b/Yesod/Definitions.hs
index 5340f864..554eb183 100644
--- a/Yesod/Definitions.hs
+++ b/Yesod/Definitions.hs
@@ -21,6 +21,10 @@ module Yesod.Definitions
     , Language
     , Location (..)
     , showLocation
+      -- * Constant values
+    , authCookieName
+    , authDisplayName
+    , encryptedCookies
     ) where
 
 import qualified Hack
@@ -66,3 +70,12 @@ data Location = AbsLoc String | RelLoc String
 showLocation :: Approot -> Location -> String
 showLocation _ (AbsLoc s) = s
 showLocation ar (RelLoc s) = ar ++ s
+
+authCookieName :: String
+authCookieName = "IDENTIFIER"
+
+authDisplayName :: String
+authDisplayName = "DISPLAY_NAME"
+
+encryptedCookies :: [String]
+encryptedCookies = [authDisplayName, authCookieName]
diff --git a/Yesod/Helpers/Auth.hs b/Yesod/Helpers/Auth.hs
index 35194413..39ff7114 100644
--- a/Yesod/Helpers/Auth.hs
+++ b/Yesod/Helpers/Auth.hs
@@ -27,7 +27,6 @@ import qualified Web.Authenticate.Rpxnow as Rpxnow
 import qualified Web.Authenticate.OpenId as OpenId
 
 import Yesod
-import Yesod.Constants
 
 import Control.Monad.Attempt
 
diff --git a/Yesod/Yesod.hs b/Yesod/Yesod.hs
index c5ab7843..b46ed294 100644
--- a/Yesod/Yesod.hs
+++ b/Yesod/Yesod.hs
@@ -10,7 +10,6 @@ import Yesod.Rep
 import Data.Object.Html (toHtmlObject)
 import Yesod.Response
 import Yesod.Request
-import Yesod.Constants
 import Yesod.Definitions
 import Yesod.Handler
 import Yesod.Template (TemplateGroup)
diff --git a/yesod.cabal b/yesod.cabal
index 7ad4eeaf..ee6c943f 100644
--- a/yesod.cabal
+++ b/yesod.cabal
@@ -55,7 +55,6 @@ library
                      failure >= 0.0.0 && < 0.1,
                      safe-failure >= 0.4.0 && < 0.5
     exposed-modules: Yesod
-                     Yesod.Constants
                      Yesod.Rep
                      Yesod.Request
                      Yesod.Response