From 5b06e66382aacbda613c7a4cdcca8afbebf1f543 Mon Sep 17 00:00:00 2001 From: Michael Snoyman Date: Mon, 31 Jan 2011 07:21:59 +0200 Subject: [PATCH] Cleaned up extension lists --- Yesod/Content.hs | 4 ---- Yesod/Core.hs | 2 -- Yesod/Dispatch.hs | 2 -- Yesod/Handler.hs | 3 --- Yesod/Request.hs | 5 +---- Yesod/Widget.hs | 2 -- 6 files changed, 1 insertion(+), 17 deletions(-) diff --git a/Yesod/Content.hs b/Yesod/Content.hs index a65acee5..1a238c93 100644 --- a/Yesod/Content.hs +++ b/Yesod/Content.hs @@ -1,11 +1,7 @@ {-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE TypeSynonymInstances #-} -{-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE Rank2Types #-} {-# LANGUAGE OverloadedStrings #-} - module Yesod.Content ( -- * Content Content (..) diff --git a/Yesod/Core.hs b/Yesod/Core.hs index b1c9093d..00d0b0b6 100644 --- a/Yesod/Core.hs +++ b/Yesod/Core.hs @@ -1,6 +1,4 @@ {-# LANGUAGE QuasiQuotes #-} -{-# LANGUAGE RankNTypes #-} -{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE OverloadedStrings #-} diff --git a/Yesod/Dispatch.hs b/Yesod/Dispatch.hs index cbc447ef..31ea35b3 100644 --- a/Yesod/Dispatch.hs +++ b/Yesod/Dispatch.hs @@ -1,8 +1,6 @@ -{-# LANGUAGE TypeFamilies #-} {-# LANGUAGE TemplateHaskell #-} {-# LANGUAGE CPP #-} {-# LANGUAGE OverloadedStrings #-} -{-# OPTIONS_GHC -fno-warn-orphans #-} module Yesod.Dispatch ( -- * Quasi-quoted routing parseRoutes diff --git a/Yesod/Handler.hs b/Yesod/Handler.hs index 80da4471..d099f37c 100644 --- a/Yesod/Handler.hs +++ b/Yesod/Handler.hs @@ -1,11 +1,8 @@ -{-# LANGUAGE ExistentialQuantification #-} {-# LANGUAGE MultiParamTypeClasses #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE TypeSynonymInstances #-} {-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE TypeFamilies #-} -{-# LANGUAGE Rank2Types #-} {-# LANGUAGE GeneralizedNewtypeDeriving #-} {-# LANGUAGE CPP #-} {-# LANGUAGE FunctionalDependencies #-} diff --git a/Yesod/Request.hs b/Yesod/Request.hs index cd5717e0..37a02960 100644 --- a/Yesod/Request.hs +++ b/Yesod/Request.hs @@ -1,6 +1,3 @@ -{-# LANGUAGE FlexibleInstances #-} -{-# LANGUAGE PackageImports #-} -{-# LANGUAGE CPP #-} --------------------------------------------------------- -- -- Module : Yesod.Request @@ -42,7 +39,7 @@ module Yesod.Request import qualified Network.Wai as W import qualified Data.ByteString.Lazy as BL -import "transformers" Control.Monad.IO.Class +import Control.Monad.IO.Class import Control.Monad (liftM) import Control.Monad.Instances () -- I'm missing the instance Monad ((->) r import Data.Maybe (listToMaybe) diff --git a/Yesod/Widget.hs b/Yesod/Widget.hs index ae4736c9..7367704d 100644 --- a/Yesod/Widget.hs +++ b/Yesod/Widget.hs @@ -1,6 +1,4 @@ {-# LANGUAGE GeneralizedNewtypeDeriving #-} -{-# LANGUAGE FlexibleContexts #-} -{-# LANGUAGE PackageImports #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE TypeFamilies #-} -- | Widgets combine HTML with JS and CSS dependencies with a unique identifier