remove some CPP that's obsolete since we require base 4.8+
This commit is contained in:
		
							parent
							
								
									7ebecb1ab8
								
							
						
					
					
						commit
						061aad0431
					
				| @ -38,9 +38,6 @@ where | |||||||
| 
 | 
 | ||||||
| import Control.Applicative ((<|>)) | import Control.Applicative ((<|>)) | ||||||
| import Data.Data (Data) | import Data.Data (Data) | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import Data.Functor.Compat ((<$>)) |  | ||||||
| #endif |  | ||||||
| import Data.List | import Data.List | ||||||
| import Data.Maybe | import Data.Maybe | ||||||
| import qualified Data.Text as T | import qualified Data.Text as T | ||||||
|  | |||||||
| @ -6,9 +6,6 @@ | |||||||
| module Hledger.UI.UIOptions | module Hledger.UI.UIOptions | ||||||
| where | where | ||||||
| import Data.Default | import Data.Default | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import Data.Functor.Compat ((<$>)) |  | ||||||
| #endif |  | ||||||
| import Data.List (intercalate) | import Data.List (intercalate) | ||||||
| import System.Environment | import System.Environment | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -8,9 +8,6 @@ See a default Yesod app's comments for more details of each part. | |||||||
| module Foundation where | module Foundation where | ||||||
| 
 | 
 | ||||||
| import Prelude | import Prelude | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import Control.Applicative ((<$>)) |  | ||||||
| #endif |  | ||||||
| import Data.IORef | import Data.IORef | ||||||
| import Yesod | import Yesod | ||||||
| import Yesod.Static | import Yesod.Static | ||||||
|  | |||||||
| @ -7,9 +7,6 @@ module Handler.AddForm where | |||||||
| 
 | 
 | ||||||
| import Import | import Import | ||||||
| 
 | 
 | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import Control.Applicative |  | ||||||
| #endif |  | ||||||
| import Control.Monad.State.Strict (evalStateT) | import Control.Monad.State.Strict (evalStateT) | ||||||
| import Data.Either (lefts,rights) | import Data.Either (lefts,rights) | ||||||
| import Data.List (sort) | import Data.List (sort) | ||||||
|  | |||||||
| @ -19,9 +19,6 @@ import Data.String | |||||||
| import Network.Wai.Handler.Warp (runSettings, defaultSettings, setHost, setPort) | import Network.Wai.Handler.Warp (runSettings, defaultSettings, setHost, setPort) | ||||||
| import Network.Wai.Handler.Launch (runHostPortUrl) | import Network.Wai.Handler.Launch (runHostPortUrl) | ||||||
| -- | -- | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import Control.Applicative ((<$>)) |  | ||||||
| #endif |  | ||||||
| import Control.Monad | import Control.Monad | ||||||
| import Data.Default | import Data.Default | ||||||
| import Data.Text (pack) | import Data.Text (pack) | ||||||
|  | |||||||
| @ -3,9 +3,6 @@ module Hledger.Web.WebOptions | |||||||
| where | where | ||||||
| import Prelude | import Prelude | ||||||
| import Data.Default | import Data.Default | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import Data.Functor.Compat ((<$>)) |  | ||||||
| #endif |  | ||||||
| import Data.Maybe | import Data.Maybe | ||||||
| import System.Environment | import System.Environment | ||||||
| 
 | 
 | ||||||
|  | |||||||
| @ -7,9 +7,6 @@ import           Prelude              as Import hiding (head, init, last, | |||||||
|                                                  readFile, tail, writeFile) |                                                  readFile, tail, writeFile) | ||||||
| import           Yesod                as Import hiding (Route (..)) | import           Yesod                as Import hiding (Route (..)) | ||||||
| 
 | 
 | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import           Control.Applicative  as Import (pure, (<$>), (<*>)) |  | ||||||
| #endif |  | ||||||
| import           Data.Text            as Import (Text) | import           Data.Text            as Import (Text) | ||||||
| 
 | 
 | ||||||
| import           Foundation           as Import | import           Foundation           as Import | ||||||
|  | |||||||
| @ -13,9 +13,6 @@ import Yesod.Default.Config | |||||||
| import Yesod.Default.Util | import Yesod.Default.Util | ||||||
| import Data.Text (Text) | import Data.Text (Text) | ||||||
| import Data.Yaml | import Data.Yaml | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import Control.Applicative |  | ||||||
| #endif |  | ||||||
| import Settings.Development | import Settings.Development | ||||||
| import Data.Default (def) | import Data.Default (def) | ||||||
| import Text.Hamlet | import Text.Hamlet | ||||||
|  | |||||||
| @ -76,9 +76,6 @@ import qualified Control.Exception as C | |||||||
| import Control.Monad (when) | import Control.Monad (when) | ||||||
| import Data.Char | import Data.Char | ||||||
| import Data.Default | import Data.Default | ||||||
| #if !MIN_VERSION_base(4,8,0) |  | ||||||
| import Data.Functor.Compat ((<$>)) |  | ||||||
| #endif |  | ||||||
| import Data.Functor.Identity (Identity) | import Data.Functor.Identity (Identity) | ||||||
| import "base-compat-batteries" Data.List.Compat | import "base-compat-batteries" Data.List.Compat | ||||||
| import Data.List.Split (splitOneOf) | import Data.List.Split (splitOneOf) | ||||||
|  | |||||||
		Loading…
	
		Reference in New Issue
	
	Block a user