Skip to content

Commit 64fd28e

Browse files
committed
Fix autogen modules list, adopt to upgraded Hackage
1 parent 7699e3a commit 64fd28e

File tree

2 files changed

+15
-11
lines changed

2 files changed

+15
-11
lines changed

System/IO/Encoding.hs

Lines changed: 12 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,6 @@
1-
{-# LANGUAGE ImplicitParams,ForeignFunctionInterface #-}
1+
{-# LANGUAGE CPP #-}
2+
{-# LANGUAGE ForeignFunctionInterface #-}
3+
{-# LANGUAGE ImplicitParams #-}
24
{- | This module provides a replacement for the normal (unicode unaware) IO functions of haskell.
35
By using implicit parameters, it can be used almost as a drop-in replacement.
46
For example, consider the following simple echo program:
@@ -31,7 +33,7 @@
3133
> e <- getSystemEncoding
3234
> let ?enc = e
3335
> str <- getContents
34-
> putStr str
36+
> putStr str
3537
-}
3638
module System.IO.Encoding
3739
(getSystemEncoding
@@ -54,14 +56,16 @@ module System.IO.Encoding
5456
,print
5557
,hPrint) where
5658

57-
import Foreign.C.String
59+
import Foreign.C.String
5860

59-
import Data.Encoding
60-
import System.IO (Handle,stdout,stdin)
61-
import Prelude hiding (print,getContents,readFile,writeFile,appendFile,interact,putStr,putStrLn,getChar,getLine,putChar)
61+
import Control.Monad.Reader (runReaderT)
62+
import qualified Data.ByteString as BS
6263
import qualified Data.ByteString.Lazy as LBS
63-
import qualified Data.ByteString as BS
64-
import Control.Monad.Reader (runReaderT)
64+
import Data.Encoding
65+
import Prelude hiding (appendFile, getChar, getContents,
66+
getLine, interact, print, putChar,
67+
putStr, putStrLn, readFile, writeFile)
68+
import System.IO (Handle, stdin, stdout)
6569

6670
-- | Like the normal 'System.IO.hGetContents', but decodes the input using an
6771
-- encoding.

encoding.cabal

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@ Description:
99
Haskell has excellect handling of unicode, the Char type covers all unicode chars. Unfortunately, there's no possibility to read or write something to the outer world in an encoding other than ascii due to the lack of support for encodings. This library should help with that.
1010
Category: Codec
1111
Homepage: http://code.haskell.org/encoding/
12-
Cabal-Version: >=1.8
12+
Cabal-Version: >=1.10
1313
Build-Type: Custom
1414
Extra-Source-Files:
1515
CHANGELOG
@@ -53,7 +53,7 @@ Library
5353
mtl >=2.0 && <2.3,
5454
regex-compat >=0.71 && <0.95
5555

56-
Extensions: CPP
56+
Default-Language: Haskell2010
5757

5858
Exposed-Modules:
5959
Data.Encoding
@@ -125,7 +125,6 @@ Library
125125
Data.Static
126126
Data.CharMap
127127
Autogen-Modules:
128-
Data.Encoding.ISO88591
129128
Data.Encoding.ISO88592
130129
Data.Encoding.ISO88593
131130
Data.Encoding.ISO88594
@@ -195,3 +194,4 @@ test-suite encoding-test
195194
, HUnit
196195
, QuickCheck
197196
ghc-options: -threaded -rtsopts -with-rtsopts=-N
197+
Default-Language: Haskell2010

0 commit comments

Comments
 (0)