summaryrefslogtreecommitdiff
path: root/dev-lang/ghc/files/ghc-7.10.1-rc3-ghc-7.10-bootstrap.patch
blob: 60db34b8b36280053f9dbde8cff962e263b7ddee (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
--- 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