You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
79 lines
2.6 KiB
79 lines
2.6 KiB
9 years ago
|
--- ghc-7.10.0.20150316-orig/compiler/utils/Pair.hs 2015-03-10 05:43:13.000000000 +1100
|
||
|
|
+++ ghc-7.10.0.20150316/compiler/utils/Pair.hs 2015-03-17 09:50:48.491115080 +1100
|
||
|
|
@@ -15,6 +15,8 @@
|
||
|
|
import Data.Foldable
|
||
|
|
import Data.Monoid
|
||
|
|
import Data.Traversable
|
||
|
|
+#else
|
||
|
|
+import Control.Applicative ((<$>))
|
||
|
|
#endif
|
||
|
|
|
||
|
|
data Pair a = Pair { pFst :: a, pSnd :: a }
|
||
|
|
--- ghc-7.10.0.20150316-orig/compiler/types/Coercion.hs 2015-03-10 05:43:13.000000000 +1100
|
||
|
|
+++ ghc-7.10.0.20150316/compiler/types/Coercion.hs 2015-03-17 10:11:21.636047380 +1100
|
||
|
|
@@ -104,6 +104,8 @@
|
||
|
|
#if __GLASGOW_HASKELL__ < 709
|
||
|
|
import Control.Applicative hiding ( empty )
|
||
|
|
import Data.Traversable (traverse, sequenceA)
|
||
|
|
+#else
|
||
|
|
+import Control.Applicative ((<$>))
|
||
|
|
#endif
|
||
|
|
import FastString
|
||
|
|
import ListSetOps
|
||
|
|
--- ghc-7.10.0.20150316-orig/compiler/typecheck/TcEvidence.hs 2015-03-14 08:48:57.000000000 +1100
|
||
|
|
+++ ghc-7.10.0.20150316/compiler/typecheck/TcEvidence.hs 2015-03-17 10:26:03.251433371 +1100
|
||
|
|
@@ -50,6 +50,8 @@
|
||
|
|
#if __GLASGOW_HASKELL__ < 709
|
||
|
|
import Control.Applicative
|
||
|
|
import Data.Traversable (traverse, sequenceA)
|
||
|
|
+#else
|
||
|
|
+import Control.Applicative ((<$>))
|
||
|
|
#endif
|
||
|
|
import qualified Data.Data as Data
|
||
|
|
import Outputable
|
||
|
|
--- ghc-7.10.0.20150316-orig/compiler/hsSyn/HsBinds.hs 2015-03-10 05:43:13.000000000 +1100
|
||
|
|
+++ ghc-7.10.0.20150316/compiler/hsSyn/HsBinds.hs 2015-03-17 10:42:21.459519033 +1100
|
||
|
|
@@ -47,6 +47,8 @@
|
||
|
|
import Data.Traversable ( Traversable(..) )
|
||
|
|
import Data.Monoid ( mappend )
|
||
|
|
import Control.Applicative hiding (empty)
|
||
|
|
+#else
|
||
|
|
+import Control.Applicative ((<$>))
|
||
|
|
#endif
|
||
|
|
|
||
|
|
{-
|
||
|
|
--- ghc-7.10.0.20150316-orig/compiler/parser/RdrHsSyn.hs 2015-03-10 05:43:13.000000000 +1100
|
||
|
|
+++ ghc-7.10.0.20150316/compiler/parser/RdrHsSyn.hs 2015-03-17 11:17:48.950929542 +1100
|
||
|
|
@@ -91,9 +91,7 @@
|
||
|
|
import Util
|
||
|
|
import ApiAnnotation
|
||
|
|
|
||
|
|
-#if __GLASGOW_HASKELL__ < 709
|
||
|
|
import Control.Applicative ((<$>))
|
||
|
|
-#endif
|
||
|
|
import Control.Monad
|
||
|
|
|
||
|
|
import Text.ParserCombinators.ReadP as ReadP
|
||
|
|
--- ghc-7.10.0.20150316-orig/compiler/typecheck/TcGenDeriv.hs 2015-03-14 08:48:57.000000000 +1100
|
||
|
|
+++ ghc-7.10.0.20150316/compiler/typecheck/TcGenDeriv.hs 2015-03-17 11:30:39.106508173 +1100
|
||
|
|
@@ -59,6 +59,8 @@
|
||
|
|
import Var
|
||
|
|
#if __GLASGOW_HASKELL__ < 709
|
||
|
|
import MonadUtils
|
||
|
|
+#else
|
||
|
|
+import Control.Applicative ((<$>))
|
||
|
|
#endif
|
||
|
|
import Outputable
|
||
|
|
import Lexeme
|
||
|
|
--- ghc-7.10.0.20150316-orig/compiler/vectorise/Vectorise/Exp.hs 2015-03-10 05:43:13.000000000 +1100
|
||
|
|
+++ ghc-7.10.0.20150316/compiler/vectorise/Vectorise/Exp.hs 2015-03-17 11:46:41.829481669 +1100
|
||
|
|
@@ -46,6 +46,8 @@
|
||
|
|
import Util
|
||
|
|
#if __GLASGOW_HASKELL__ < 709
|
||
|
|
import MonadUtils
|
||
|
|
+#else
|
||
|
|
+import Control.Applicative ((<$>))
|
||
|
|
#endif
|
||
|
|
|
||
|
|
import Control.Monad
|