a2dc0a9 · vty · git.iko.soy

git.iko.soy/vty

Merge pull request #178 from jtdaugherty/import-warnings

Remove import warnings

commita2dc0a9a3825517373eb728859c0f34aeb6598c2 authorJonathan Daugherty <cygnus@foobox.com> dateTue 1 Oct 2019, 09:58 (7 years ago) parent6aa1d05 7d1bcce

7 files changed+18−6

compare with master

unifiedsplit

src/Graphics/Vty/Config.hs+2 src/Graphics/Vty/Input.hs+3−1 src/Graphics/Vty/Output.hs+4−2 src/Graphics/Vty/Output/TerminfoBased.hs+5−1 src/Graphics/Vty/Output/XTermColor.hs+4 src/Graphics/Vty/PictureToSpans.hs−1 src/Graphics/Vty/Span.hs−1

src/Graphics/Vty/Config.hs+2

@@ -76,7 +76,9 @@ import Control.Exception (catch, IOException, Exception(..), throwIO)

7676import Control.Monad (liftM, guard, void)

7777

7878import qualified Data.ByteString as BS

79+#if !(MIN_VERSION_base(4,8,0))

7980import Data.Monoid (Monoid(..))

81+#endif

8082#if !(MIN_VERSION_base(4,11,0))

8183import Data.Semigroup (Semigroup(..))

8284#endif

src/Graphics/Vty/Input.hs+3−1

@@ -1,4 +1,4 @@

1−{-# LANGUAGE RecordWildCards #-}

1+{-# LANGUAGE RecordWildCards, CPP #-}

33-- | This module provides the input layer for Vty, including methods

44-- for initializing an 'Input' structure and reading 'Event's from the

@@ -132,7 +132,9 @@ import Lens.Micro

132132import qualified System.Console.Terminfo as Terminfo

133133import System.Posix.Signals.Exts

134134

135+#if !MIN_VERSION_base(4,11,0)

135136import Data.Monoid ((<>))

137+#endif

136138

137139-- | Set up the terminal with file descriptor `inputFd` for input.

138140-- Returns an 'Input'.

src/Graphics/Vty/Output.hs+4−2

@@ -1,5 +1,4 @@

1−{-# LANGUAGE RecordWildCards #-}

2−{-# LANGUAGE NamedFieldPuns #-}

1+{-# LANGUAGE RecordWildCards, NamedFieldPuns, CPP #-}

32-- | This module provides functions for accessing the current terminal

43-- or a specific terminal device.

54--

@@ -39,7 +38,10 @@ import Graphics.Vty.Output.TerminfoBased as TerminfoBased

3938import Blaze.ByteString.Builder (writeToByteString)

4039

4140import Data.List (isPrefixOf)

41+

42+#if !MIN_VERSION_base(4,11,0)

4243import Data.Monoid ((<>))

44+#endif

4345

4446-- | Returns an `Output` for the terminal specified in `Config`.

4547--

src/Graphics/Vty/Output/TerminfoBased.hs+5−1

@@ -1,6 +1,7 @@

11{-# LANGUAGE RecordWildCards #-}

22{-# LANGUAGE FlexibleInstances #-}

33{-# LANGUAGE OverloadedStrings #-}

4+{-# LANGUAGE CPP #-}

45{-# OPTIONS_GHC -D_XOPEN_SOURCE=500 -fno-warn-warnings-deprecations #-}

56{-# CFILES gwinsz.c #-}

@@ -26,11 +27,14 @@ import Graphics.Vty.Output.Interface

2627import Blaze.ByteString.Builder (Write, writeToByteString, writeStorable)

2728

2829import Data.Bits ((.&.))

29−import Data.Foldable (foldMap)

3030import Data.IORef

3131import Data.Maybe (isJust, isNothing, fromJust)

3232import Data.Word

3333

34+#if !MIN_VERSION_base(4,8,0)

35+import Data.Foldable (foldMap)

36+#endif

37+

3438import Foreign.C.Types ( CInt(..), CLong(..) )

3539import Foreign.ForeignPtr (withForeignPtr)

3640import Foreign.Ptr (Ptr, plusPtr)

src/Graphics/Vty/Output/XTermColor.hs+4

@@ -1,3 +1,4 @@

1+{-# Language CPP #-}

23-- | Xterm output driver. This uses the Terminfo driver with some

34-- extensions for Xterm.

@@ -24,7 +25,10 @@ import System.Posix.Env (getEnv)

2425

2526import Data.List (isInfixOf)

2627import Data.Maybe (catMaybes)

28+

29+#if !MIN_VERSION_base(4,11,0)

2730import Data.Monoid ((<>))

31+#endif

2832

2933-- | Construct an Xterm output driver. Initialize the display to UTF-8.

3034reserveTerminal :: ( Applicative m, MonadIO m ) => String -> Fd -> m Output

src/Graphics/Vty/PictureToSpans.hs−1

@@ -13,7 +13,6 @@ import Graphics.Vty.Image

1313import Graphics.Vty.Image.Internal

1414import Graphics.Vty.Picture

1515import Graphics.Vty.Span

16−import Graphics.Text.Width (wctlwidth)

1716

1817import Lens.Micro

1918import Lens.Micro.Mtl

src/Graphics/Vty/Span.hs−1

@@ -14,7 +14,6 @@ module Graphics.Vty.Span where

1414import Graphics.Vty.Attributes (Attr)

1515import Graphics.Vty.Image

1616import Graphics.Vty.Image.Internal ( clipText )

17−import Graphics.Text.Width (wctlwidth)

1817

1918import qualified Data.Text.Lazy as TL

2019import Data.Vector (Vector)