Permalink
Browse files

Rename Snap.Types to Snap.Core

  • Loading branch information...
1 parent a76f2f7 commit f14faee089e2d1ee486a3dd23d0e72c1480d2118 @gregorycollins gregorycollins committed Aug 13, 2011
View
@@ -8,8 +8,8 @@ module Main where
import Data.Lens.Lazy
import Data.Lens.Template
import qualified Data.Text as T
+import Snap.Core
import Snap.Http.Server.Config
-import Snap.Types
import Snap.Util.FileServe
import Snap.Snaplet
@@ -2,7 +2,7 @@
module Main where
import Control.Applicative
-import Snap.Types
+import Snap.Core
import Snap.Util.FileServe
import Snap.Http.Server
@@ -17,7 +17,7 @@ import qualified Data.Text.Encoding as T
import Snap.Extension.Heist
import Snap.Extension.Timer
import Snap.Util.FileServe
-import Snap.Types
+import Snap.Core
import Text.Templating.Heist
import Application
View
@@ -24,7 +24,7 @@ import Language.Haskell.TH
import System.Environment (getArgs)
------------------------------------------------------------------------------
-import Snap.Types
+import Snap.Core
import Snap.Loader.Devel.Signal
import Snap.Loader.Devel.Evaluator
import Snap.Loader.Devel.TreeWatcher
@@ -145,7 +145,7 @@ hintSnap opts modules imports srcPaths action =
where
interpreter = do
loadModules . nub $ modules
- setImports . nub $ "Prelude" : "Snap.Types" : imports ++ modules
+ setImports . nub $ "Prelude" : "Snap.Core" : imports ++ modules
interpret action (as :: HintLoadable)
@@ -15,7 +15,7 @@ import Control.Concurrent.MVar
import Prelude hiding (catch, init, any)
-import Snap.Types (Snap)
+import Snap.Core (Snap)
------------------------------------------------------------------------------
@@ -21,7 +21,7 @@ module Snap.Snaplet.Auth.Handlers
import Data.ByteString (ByteString)
-import Snap.Types
+import Snap.Core
import Snap.Snaplet.Auth.Types
import Snap.Snaplet
@@ -15,7 +15,7 @@ import Data.ByteString.Char8 (ByteString)
import qualified Data.ByteString as B
import Data.Time
-import Snap.Types
+import Snap.Core
import Snap.Snaplet
import Snap.Snaplet.Auth.Password
import Snap.Snaplet.Session
@@ -57,7 +57,7 @@ import Text.Templating.Heist.Splices.Cache
import Snap.Snaplet
-- TODO: It shouldn't be necessary to import this internal module.
import Snap.Snaplet.Internal.Types
-import Snap.Types
+import Snap.Core
import Snap.Util.FileServe
-- FIXME
@@ -45,7 +45,7 @@ import Data.Lens.Lazy
import Data.Text (Text)
import qualified Data.Text as T
import Snap.Http.Server
-import Snap.Types
+import Snap.Core
import Snap.Util.GZip
import System.Directory
import System.Directory.Tree
@@ -15,7 +15,7 @@ import Control.Monad.Reader
import Control.Monad.State.Class
import Data.Lens.Lazy
import Prelude hiding ((.), id, catch)
-import Snap.Types
+import Snap.Core
import Snap.Snaplet.Internal.RST
@@ -15,7 +15,7 @@ import Control.Monad.Reader
import Control.Monad.Reader.Class
import Control.Monad.State.Class
import Prelude hiding ((.), id, catch)
-import Snap.Types
+import Snap.Core
------------------------------------------------------------------------------
@@ -30,7 +30,7 @@ import Data.Text (Text)
import qualified Data.Text as T
import Snap.Snaplet.Internal.Lens
-import Snap.Types
+import Snap.Core
-- FIXME REMOVE
import Snap.Snaplet.Internal.TemporaryLensCruft
@@ -28,7 +28,7 @@ import Data.Text (Text)
import Snap.Snaplet
import Snap.Snaplet.Session.SecureCookie
-import Snap.Types
+import Snap.Core
import Snap.Snaplet.Session.SessionManager
( SessionManager(..), ISessionManager(..) )
@@ -16,7 +16,7 @@ import qualified Data.Serialize as S
import Data.Text (Text)
import Web.ClientSession
-import Snap.Types (Snap)
+import Snap.Core (Snap)
import Snap.Snaplet
import Snap.Snaplet.Session.Common (mkCSRFToken)
import Snap.Snaplet.Session.SessionManager
@@ -19,7 +19,7 @@ import Control.Monad.Trans.Class (lift)
import Data.Text.Encoding as T
-import Snap.Types
+import Snap.Core
import Snap.Snaplet.Session (MonadSession(..), sessionCSRFToken)
import qualified Text.XmlHtml as X
@@ -27,7 +27,7 @@ import Data.Time.Clock.POSIX
import Data.Serialize
import Web.ClientSession
-import Snap.Types
+import Snap.Core
@@ -9,7 +9,7 @@ import Data.Serialize (Serialize)
import Data.Text (Text)
import Prelude hiding (lookup)
-import Snap.Types (Snap)
+import Snap.Core (Snap)
import Snap.Snaplet
View
@@ -16,7 +16,7 @@ import Data.Lens.Lazy
import Data.Lens.Template
import qualified Data.Text as T
import Snap.Http.Server.Config
-import Snap.Types
+import Snap.Core
import Snap.Util.FileServe
import Snap.Snaplet
@@ -16,7 +16,7 @@ import Data.Lens.Template
import qualified Data.Text as T
import qualified Data.Text.Encoding as T
import Data.Configurator
-import Snap.Types
+import Snap.Core
import Snap.Util.FileServe
import Snap.Snaplet
@@ -11,7 +11,7 @@ import Data.Maybe
import Data.Configurator
import Snap.Snaplet
import Snap.Snaplet.Heist
-import Snap.Types
+import Snap.Core
import Text.Templating.Heist
data BarSnaplet = BarSnaplet { barField :: String }
@@ -10,7 +10,7 @@ import Data.Maybe
import qualified Data.Text as T
import Snap.Snaplet
import Snap.Snaplet.Heist
-import Snap.Types
+import Snap.Core
import Text.Templating.Heist
data FooSnaplet = FooSnaplet { fooField :: String }
View
@@ -7,7 +7,7 @@ module Main where
import Data.Record.Label
import qualified Data.Text as T
-import Snap.Types
+import Snap.Core
import Snap.Snaplet
import Snap.Snaplet.Heist

0 comments on commit f14faee

Please sign in to comment.