e5384b9 · Idris-dev · git.iko.soy

idris.cabal+2−2

compare with master

unifiedsplit

@@ -820,10 +820,10 @@ Library

820 , containers >= 0.5 && < 0.6

821 , deepseq < 1.5

822 , directory >= 1.2 && < 1.3

823− , filepath < 1.4

823+ , filepath < 1.5

824 , fingertree >= 0.1 && < 0.2

825 , haskeline >= 0.7 && < 0.8

826− , lens >= 4.1.1 && < 4.8

826+ , lens >= 4.1.1 && < 4.9

827 , mtl >= 2.1 && < 2.3

828 , network < 2.7

829 , optparse-applicative >= 0.11 && < 0.12

src/Idris/AbsSyntaxTree.hs+2

@@ -18,6 +18,8 @@ import Idris.Colours

18import System.Console.Haskeline

19import System.IO

20

21+import Prelude hiding ((<$>))

22+

21import Control.Applicative ((<|>))

23import Control.Applicative ((<|>))

22

24

23import Control.Monad.Trans.State.Strict

25import Control.Monad.Trans.State.Strict

src/Idris/Delaborate.hs+2

@@ -13,6 +13,8 @@ import Idris.Core.Evaluate

13import Idris.Docstrings (overview, renderDocstring, renderDocTerm)

14import Idris.ErrReverse

15

16+import Prelude hiding ((<$>))

17+

16import Data.List (intersperse, nub)

18import Data.List (intersperse, nub)

17import qualified Data.Text as T

19import qualified Data.Text as T

18import Control.Monad.State

20import Control.Monad.State

src/Idris/Docs.hs+2

@@ -11,6 +11,8 @@ import Idris.Docstrings (Docstring, emptyDocstring, noDocs, nullDocstring, rende

11

12import Util.Pretty

13

14+import Prelude hiding ((<$>))

15+

14import Control.Arrow (first)

16import Control.Arrow (first)

15

17

16import Data.Maybe

18import Data.Maybe

src/Idris/Docstrings.hs+2

@@ -15,6 +15,8 @@ import Util.Pretty

15

16import Idris.Core.TT (OutputAnnotation(..), TextFormatting(..), Name, Term, Err)

17

18+import Prelude hiding ((<$>))

19+

18import qualified Data.Text as T

20import qualified Data.Text as T

19import qualified Data.Foldable as F

21import qualified Data.Foldable as F

20import Data.Foldable (Foldable)

22import Data.Foldable (Foldable)

src/Idris/Output.hs+3−1

@@ -15,10 +15,12 @@ import Util.ScreenSize (getScreenWidth)

15

16import Control.Monad.Trans.Except (ExceptT (ExceptT), runExceptT)

17

18−import System.Console.Haskeline.MonadException

18+import System.Console.Haskeline.MonadException

19 (MonadException (controlIO), RunIO (RunIO))

20import System.IO (stdout, Handle, hPutStrLn)

21

22+import Prelude hiding ((<$>))

23+

22import Data.Char (isAlpha)

24import Data.Char (isAlpha)

23import Data.List (nub, intersperse)

25import Data.List (nub, intersperse)

24import Data.Maybe (fromMaybe)

26import Data.Maybe (fromMaybe)

src/Idris/REPL.hs+1−1

@@ -59,7 +59,7 @@ import IRTS.System

59

60import Control.Category

61import qualified Control.Exception as X

62−import Prelude hiding ((.), id)

62+import Prelude hiding ((<$>), (.), id)

63import Data.List.Split (splitOn)

64import Data.List (groupBy)

65import qualified Data.Text as T