From 2c0054048553565d3ccdd3b7e415fc001d70859c Mon Sep 17 00:00:00 2001 From: John MacFarlane Date: Sun, 14 Jan 2018 18:34:26 -0800 Subject: Use base-compat for our custom prelude. This should give us more complete coverage of newer base features. See #4255. --- prelude/Prelude.hs | 20 +++++--------------- 1 file changed, 5 insertions(+), 15 deletions(-) (limited to 'prelude') diff --git a/prelude/Prelude.hs b/prelude/Prelude.hs index 34f133d83..8f5181fba 100644 --- a/prelude/Prelude.hs +++ b/prelude/Prelude.hs @@ -1,3 +1,4 @@ +{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE PackageImports #-} {-# LANGUAGE CPP #-} @@ -6,21 +7,10 @@ module Prelude ( - module P -#if MIN_VERSION_base(4,8,0) -#else -, Monoid(..) -, Applicative(..) -, (<$>) -, (<$) -#endif + module Prelude.Compat +, module Monoid.Compat ) where -#if MIN_VERSION_base(4,8,0) -import "base" Prelude as P -#else -import "base" Prelude as P -import Control.Applicative -import Data.Monoid -#endif +import Prelude.Compat +import Monoid.Compat -- cgit v1.2.3