From 74cf1f77be991bf4c5441698ab42c2cd030a13af Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Fri, 12 Oct 2012 11:19:45 +0200 Subject: [PATCH] Get rid of export lists --- yesod/scaffold/Foundation.hs.cg | 15 +---------- yesod/scaffold/Import.hs.cg | 45 +++++++++++++++------------------ yesod/scaffold/Settings.hs.cg | 9 +------ yesod/scaffold/tests/main.hs.cg | 1 - 4 files changed, 23 insertions(+), 47 deletions(-) diff --git a/yesod/scaffold/Foundation.hs.cg b/yesod/scaffold/Foundation.hs.cg index 43afadb2..f2fb2e7c 100644 --- a/yesod/scaffold/Foundation.hs.cg +++ b/yesod/scaffold/Foundation.hs.cg @@ -1,17 +1,4 @@ -module Foundation - ( ~sitearg~ (..) - , Route (..) - , ~sitearg~Message (..) - , resources~sitearg~ - , Handler - , Widget - , Form - , maybeAuth - , requireAuth - , module Settings - , module Model - , getExtra - ) where +module Foundation where import Prelude import Yesod diff --git a/yesod/scaffold/Import.hs.cg b/yesod/scaffold/Import.hs.cg index 13e396a3..e2fe88fd 100644 --- a/yesod/scaffold/Import.hs.cg +++ b/yesod/scaffold/Import.hs.cg @@ -1,31 +1,28 @@ module Import - ( module Prelude - , module Yesod - , module Foundation - , module Settings.StaticFiles - , module Settings.Development - , module Data.Monoid - , module Control.Applicative - , Text -#if __GLASGOW_HASKELL__ < 704 - , (<>) -#endif + ( module Import ) where -import Prelude hiding (writeFile, readFile, head, tail, init, last) -import Yesod hiding (Route(..)) -import Foundation -#if __GLASGOW_HASKELL__ < 704 -import Data.Monoid (Monoid (mappend, mempty, mconcat)) -#else -import Data.Monoid (Monoid (mappend, mempty, mconcat), (<>)) -#endif -import Control.Applicative ((<$>), (<*>), pure) -import Data.Text (Text) -import Settings.StaticFiles -import Settings.Development +import Prelude as Import hiding (head, init, last, + readFile, tail, writeFile) +import Yesod as Import hiding (Route (..)) + +import Control.Applicative as Import (pure, (<$>), (<*>)) +import Data.Text as Import (Text) + +import Foundation as Import +import Model as Import +import Settings as Import +import Settings.Development as Import +import Settings.StaticFiles as Import + +#if __GLASGOW_HASKELL__ >= 704 +import Data.Monoid as Import + (Monoid (mappend, mempty, mconcat), + (<>)) +#else +import Data.Monoid as Import + (Monoid (mappend, mempty, mconcat)) -#if __GLASGOW_HASKELL__ < 704 infixr 5 <> (<>) :: Monoid m => m -> m -> m (<>) = mappend diff --git a/yesod/scaffold/Settings.hs.cg b/yesod/scaffold/Settings.hs.cg index f6f76df8..a45f38a7 100644 --- a/yesod/scaffold/Settings.hs.cg +++ b/yesod/scaffold/Settings.hs.cg @@ -3,14 +3,7 @@ -- In addition, you can configure a number of different aspects of Yesod -- by overriding methods in the Yesod typeclass. That instance is -- declared in the Foundation.hs file. -module Settings - ( widgetFile - , PersistConfig - , staticRoot - , staticDir - , Extra (..) - , parseExtra - ) where +module Settings where import Prelude import Text.Shakespeare.Text (st) diff --git a/yesod/scaffold/tests/main.hs.cg b/yesod/scaffold/tests/main.hs.cg index ba3cbc18..96d7ea77 100644 --- a/yesod/scaffold/tests/main.hs.cg +++ b/yesod/scaffold/tests/main.hs.cg @@ -5,7 +5,6 @@ module Main where import Import -import Settings import Yesod.Default.Config import Yesod.Test import Application (makeFoundation)