git.iko.soy/vty
on master help sign in
adjust imports to satisfy GHC 7.4 and above
d65b85cCorey O'Connor
src/Graphics/Vty/Config.hs+4−2
compare with master
unifiedsplit
@@ -34,6 +34,9 @@
34--
34--
35module Graphics.Vty.Config where
35module Graphics.Vty.Config where
36
36
37+-- ignore warning on GHC 7.6+. Required for GHC 7.4
38+import Prelude hiding (catch)
39+
37import Control.Applicative hiding (many)
40import Control.Applicative hiding (many)
38
41
39import Control.Exception (tryJust, catch, IOException)
42import Control.Exception (tryJust, catch, IOException)
@@ -43,7 +46,6 @@ import Control.Monad.Trans.Writer
43
46
44import qualified Data.ByteString as BS
47import qualified Data.ByteString as BS
45import Data.Default
48import Data.Default
46−import Data.Either (either)
47import Data.Monoid
49import Data.Monoid
48
50
49import Graphics.Vty.Input.Events
51import Graphics.Vty.Input.Events
@@ -97,7 +99,7 @@ userConfig = do
97parseConfigFile :: FilePath -> IO Config
99parseConfigFile :: FilePath -> IO Config
98parseConfigFile path = do
100parseConfigFile path = do
99 catch (runParseConfig path <$> BS.readFile path)
101 catch (runParseConfig path <$> BS.readFile path)
100− (\(e :: IOException) -> return def)
102+ (\(_ :: IOException) -> return def)
101
103
102runParseConfig :: Stream s (Writer Config) Char => String -> s -> Config
104runParseConfig :: Stream s (Writer Config) Char => String -> s -> Config
103runParseConfig name = execWriter . runParserT parseConfig () name
105runParseConfig name = execWriter . runParserT parseConfig () name