on master help sign in
Remove a bunch of Control.Applicative imports since we're only GHC 7.10 now
c9f3911Evan Czaplicki
src/AST/Module.hs−1
@@ -9,7 +9,6 @@ module AST.Module
9 , UserImport, DefaultImport, ImportMethod(..)
9 , UserImport, DefaultImport, ImportMethod(..)
10 ) where
10 ) where
11
11
12−import Control.Applicative ((<$>),(<*>))
13import Data.Binary
12import Data.Binary
14import qualified Data.Map as Map
13import qualified Data.Map as Map
15
14
src/AST/Module/Name.hs−1
@@ -1,6 +1,5 @@
1module AST.Module.Name where
1module AST.Module.Name where
2
2
3−import Control.Applicative ((<$>),(<*>))
4import Data.Binary
3import Data.Binary
5import qualified Data.List as List
4import qualified Data.List as List
6
5
src/AST/Type.hs−1
@@ -8,7 +8,6 @@ module AST.Type
8 , tuple
8 , tuple
9 ) where
9 ) where
10
10
11−import Control.Applicative ((<$>), (<*>))
12import Control.Arrow (second)
11import Control.Arrow (second)
13import Data.Binary
12import Data.Binary
14import qualified Data.Map as Map
13import qualified Data.Map as Map
src/AST/Variable.hs−1
@@ -1,6 +1,5 @@
1module AST.Variable where
1module AST.Variable where
2
2
3−import Control.Applicative ((<$>), (<*>))
4import Data.Binary
3import Data.Binary
5import qualified Data.Map as Map
4import qualified Data.Map as Map
6import qualified Data.Maybe as Maybe
5import qualified Data.Maybe as Maybe
src/Canonicalize.hs−1
@@ -1,6 +1,5 @@
1module Canonicalize (module') where
1module Canonicalize (module') where
2
2
3−import Control.Applicative ((<$>),(<*>))
4import qualified Data.List as List
3import qualified Data.List as List
5import qualified Data.Map as Map
4import qualified Data.Map as Map
6import qualified Data.Maybe as Maybe
5import qualified Data.Maybe as Maybe
src/Canonicalize/Port.hs−1
@@ -1,6 +1,5 @@
1module Canonicalize.Port (check) where
1module Canonicalize.Port (check) where
2
2
3−import Control.Applicative ((<$>))
4import qualified Data.Foldable as Foldable
3import qualified Data.Foldable as Foldable
5
4
6import qualified AST.Declaration as D
5import qualified AST.Declaration as D
src/Canonicalize/Setup.hs−1
@@ -1,7 +1,6 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2module Canonicalize.Setup (environment) where
2module Canonicalize.Setup (environment) where
3
3
4−import Control.Applicative ((<$>))
5import Control.Arrow (second)
4import Control.Arrow (second)
6import qualified Data.Graph as Graph
5import qualified Data.Graph as Graph
7import qualified Data.Map as Map
6import qualified Data.Map as Map
src/Canonicalize/Sort.hs−1
@@ -2,7 +2,6 @@
2module Canonicalize.Sort (definitions) where
2module Canonicalize.Sort (definitions) where
3
3
4import Control.Monad.State
4import Control.Monad.State
5−import Control.Applicative ((<$>),(<*>))
6import qualified Data.Graph as Graph
5import qualified Data.Graph as Graph
7import qualified Data.Map as Map
6import qualified Data.Map as Map
8import qualified Data.Maybe as Maybe
7import qualified Data.Maybe as Maybe
src/Canonicalize/Type.hs−1
@@ -1,7 +1,6 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2module Canonicalize.Type (tipe) where
2module Canonicalize.Type (tipe) where
3
3
4−import Control.Applicative ((<$>),(<*>))
5import qualified Data.Traversable as Trav
4import qualified Data.Traversable as Trav
6
5
7import qualified AST.Type as T
6import qualified AST.Type as T
src/Docs/Check.hs−1
@@ -1,6 +1,5 @@
1module Docs.Check (check) where
1module Docs.Check (check) where
2
2
3−import Control.Applicative ((<$>),(<*>))
4import qualified Data.List as List
3import qualified Data.List as List
5import qualified Data.Map as Map
4import qualified Data.Map as Map
6import qualified Data.Set as Set
5import qualified Data.Set as Set
src/Elm/Compiler/Type.hs−1
@@ -4,7 +4,6 @@ module Elm.Compiler.Type
4 , toString
4 , toString
5 ) where
5 ) where
6
6
7−import Control.Applicative ((<$>), (<*>))
8import Control.Arrow (second)
7import Control.Arrow (second)
9import Data.Aeson ((.:))
8import Data.Aeson ((.:))
10import qualified Data.Aeson as Json
9import qualified Data.Aeson as Json
src/Elm/Docs.hs+1−1
@@ -1,7 +1,7 @@
1{-# LANGUAGE OverloadedStrings #-}
1{-# LANGUAGE OverloadedStrings #-}
2module Elm.Docs where
2module Elm.Docs where
3
3
4−import Control.Applicative ((<$>),(<*>),(<|>))
4+import Control.Applicative ((<|>))
5import Control.Monad
5import Control.Monad
6import Data.Aeson ((.:), (.:?), (.=))
6import Data.Aeson ((.:), (.:?), (.=))
7import qualified Data.Aeson as Json
7import qualified Data.Aeson as Json
src/Elm/Package.hs−1
@@ -1,6 +1,5 @@
1module Elm.Package where
1module Elm.Package where
2
2
3−import Control.Applicative ((<$>), (<*>))
4import Data.Aeson
3import Data.Aeson
5import Data.Binary
4import Data.Binary
6import qualified Data.Char as Char
5import qualified Data.Char as Char
src/Nitpick/PatternMatches.hs−1
@@ -1,6 +1,5 @@
1module Nitpick.PatternMatches (patternMatches) where
1module Nitpick.PatternMatches (patternMatches) where
2
2
3−import Control.Applicative ((<$>), (<*))
4import Control.Arrow (second)
3import Control.Arrow (second)
5import qualified Data.Foldable as F
4import qualified Data.Foldable as F
6import qualified Data.Map as Map
5import qualified Data.Map as Map
src/Optimize.hs−1
@@ -1,6 +1,5 @@
1module Optimize (optimize) where
1module Optimize (optimize) where
2
2
3−import Control.Applicative
4import qualified Control.Monad as M
3import qualified Control.Monad as M
5import qualified Data.Traversable as T
4import qualified Data.Traversable as T
6
5
src/Parse/Binop.hs−1
@@ -1,6 +1,5 @@
1module Parse.Binop (binops, OpTable) where
1module Parse.Binop (binops, OpTable) where
2
2
3−import Control.Applicative ((<$>))
4import qualified Data.List as List
3import qualified Data.List as List
5import qualified Data.Map as Map
4import qualified Data.Map as Map
6import Text.Parsec ((<|>), choice, getState, try)
5import Text.Parsec ((<|>), choice, getState, try)
src/Parse/Declaration.hs−1
@@ -1,7 +1,6 @@
1{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-}
1{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-}
2module Parse.Declaration where
2module Parse.Declaration where
3
3
4−import Control.Applicative ((<$>))
5import Text.Parsec ( (<|>), (<?>), choice, digit, optionMaybe, string, try )
4import Text.Parsec ( (<|>), (<?>), choice, digit, optionMaybe, string, try )
6
5
7import qualified AST.Declaration as D
6import qualified AST.Declaration as D
src/Parse/Expression.hs−1
@@ -1,6 +1,5 @@
1module Parse.Expression (term, typeAnnotation, definition, expr) where
1module Parse.Expression (term, typeAnnotation, definition, expr) where
2
2
3−import Control.Applicative ((<$>), (<*>))
4import qualified Data.List as List
3import qualified Data.List as List
5import Text.Parsec hiding (newline, spaces)
4import Text.Parsec hiding (newline, spaces)
6import Text.Parsec.Indent (block, withPos)
5import Text.Parsec.Indent (block, withPos)
src/Parse/Helpers.hs−1
@@ -1,7 +1,6 @@
1module Parse.Helpers where
1module Parse.Helpers where
2
2
3import Prelude hiding (until)
3import Prelude hiding (until)
4−import Control.Applicative ((<$>),(<*>),(<*))
5import Control.Monad (guard, join)
4import Control.Monad (guard, join)
6import Control.Monad.State (State)
5import Control.Monad.State (State)
7import Data.Char (isUpper)
6import Data.Char (isUpper)
src/Parse/Literal.hs−1
@@ -1,7 +1,6 @@
1module Parse.Literal (literal) where
1module Parse.Literal (literal) where
2
2
3import Prelude hiding (exponent)
3import Prelude hiding (exponent)
4−import Control.Applicative ((<$>))
5import Text.Parsec ((<|>), (<?>), digit, hexDigit, lookAhead, many1, option, string, try)
4import Text.Parsec ((<|>), (<?>), digit, hexDigit, lookAhead, many1, option, string, try)
6import Parse.Helpers (IParser, chr, str)
5import Parse.Helpers (IParser, chr, str)
7import qualified AST.Literal as L
6import qualified AST.Literal as L
src/Parse/Module.hs−1
@@ -1,6 +1,5 @@
1module Parse.Module (moduleDecl, header, getModuleName) where
1module Parse.Module (moduleDecl, header, getModuleName) where
2
2
3−import Control.Applicative ((<$>), (<*>))
4import Text.Parsec hiding (newline, spaces)
3import Text.Parsec hiding (newline, spaces)
5
4
6import Parse.Helpers
5import Parse.Helpers
src/Parse/Parse.hs−1
@@ -1,7 +1,6 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2module Parse.Parse (program, parse) where
2module Parse.Parse (program, parse) where
3
3
4−import Control.Applicative ((<$>), (<*>))
5import qualified Data.Map as Map
4import qualified Data.Map as Map
6import qualified Data.Traversable as T
5import qualified Data.Traversable as T
7import Text.Parsec (char, eof, letter, many, optional, putState, (<|>))
6import Text.Parsec (char, eof, letter, many, optional, putState, (<|>))
src/Parse/Pattern.hs−1
@@ -1,6 +1,5 @@
1module Parse.Pattern (term, expr) where
1module Parse.Pattern (term, expr) where
2
2
3−import Control.Applicative ((<$>))
4import Data.Char (isUpper)
3import Data.Char (isUpper)
5import qualified Data.List as List
4import qualified Data.List as List
6import Text.Parsec ((<|>), (<?>), char, choice, optionMaybe, try)
5import Text.Parsec ((<|>), (<?>), char, choice, optionMaybe, try)
src/Parse/Type.hs−1
@@ -1,7 +1,6 @@
1{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-}
1{-# OPTIONS_GHC -Wall -fno-warn-unused-do-bind #-}
2module Parse.Type where
2module Parse.Type where
3
3
4−import Control.Applicative ((<$>),(<*>),(<*))
5import Data.List (intercalate)
4import Data.List (intercalate)
6import Text.Parsec ((<|>), (<?>), char, many, optionMaybe, string, try)
5import Text.Parsec ((<|>), (<?>), char, many, optionMaybe, string, try)
7
6
src/Reporting/Result.hs+1−1
@@ -1,6 +1,6 @@
1module Reporting.Result where
1module Reporting.Result where
2
2
3−import Control.Applicative (Applicative, (<*>), (<|>), pure)
3+import Control.Applicative ((<|>))
4import qualified Control.Monad as M
4import qualified Control.Monad as M
5import Control.Monad.Except (Except, runExcept)
5import Control.Monad.Except (Except, runExcept)
6
6
src/Type/Constrain/Expression.hs−1
@@ -1,7 +1,6 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2module Type.Constrain.Expression where
2module Type.Constrain.Expression where
3
3
4−import Control.Applicative ((<$>))
5import Control.Arrow (second)
4import Control.Arrow (second)
6import qualified Control.Monad as Monad
5import qualified Control.Monad as Monad
7import qualified Data.List as List
6import qualified Data.List as List
src/Type/Constrain/Pattern.hs−1
@@ -2,7 +2,6 @@
2module Type.Constrain.Pattern where
2module Type.Constrain.Pattern where
3
3
4import Control.Arrow (second)
4import Control.Arrow (second)
5−import Control.Applicative ((<$>))
6import qualified Control.Monad as Monad
5import qualified Control.Monad as Monad
7import qualified Data.Map as Map
6import qualified Data.Map as Map
8
7
src/Type/Solve.hs+1−1
@@ -1,6 +1,6 @@
1module Type.Solve (solve) where
1module Type.Solve (solve) where
2
2
3−import Control.Applicative ((<$>), (<*>), (<|>))
3+import Control.Applicative ((<|>))
4import Control.Monad
4import Control.Monad
5import Control.Monad.State (StateT, execStateT, liftIO)
5import Control.Monad.State (StateT, execStateT, liftIO)
6import Control.Monad.Except (ExceptT, throwError)
6import Control.Monad.Except (ExceptT, throwError)
src/Type/State.hs+1−1
@@ -2,7 +2,7 @@
2{-# LANGUAGE MultiParamTypeClasses #-}
2{-# LANGUAGE MultiParamTypeClasses #-}
3module Type.State where
3module Type.State where
4
4
5−import Control.Applicative ( Applicative, (<$>), (<*>), (<|>) )
5+import Control.Applicative ((<|>))
6import Control.Monad.State
6import Control.Monad.State
7import Data.Map ((!))
7import Data.Map ((!))
8import qualified Data.Map as Map
8import qualified Data.Map as Map
src/Type/Type.hs−1
@@ -1,6 +1,5 @@
1module Type.Type where
1module Type.Type where
2
2
3−import Control.Applicative ((<$>),(<*>))
4import Control.Monad.State (StateT)
3import Control.Monad.State (StateT)
5import qualified Control.Monad.State as State
4import qualified Control.Monad.State as State
6import qualified Data.Char as Char
5import qualified Data.Char as Char
src/Validate.hs−1
@@ -1,7 +1,6 @@
1{-# OPTIONS_GHC -Wall #-}
1{-# OPTIONS_GHC -Wall #-}
2module Validate (declarations) where
2module Validate (declarations) where
3
3
4−import Control.Applicative ((<$>),(<*>))
5import qualified Data.Map as Map
4import qualified Data.Map as Map
6import qualified Data.Set as Set
5import qualified Data.Set as Set
7import qualified Data.Foldable as F
6import qualified Data.Foldable as F