From 4b8a0341ac4c8c96b8c3bab231909b0a4982a735 Mon Sep 17 00:00:00 2001 From: Daniel Wagner Date: Thu, 30 Jul 2009 16:38:21 -0700 Subject: [PATCH] export encodingFromStringMaybe (as encodingFromStringExplicit for consistency) Ignore-this: 93f0968658fbdcd66f8f352308ebb1d5 darcs-hash:20090730233821-76d51-9ee074434d3626ad1a49cc44678d937fdb8750ce --- Data/Encoding.hs | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/Data/Encoding.hs b/Data/Encoding.hs index 895aa48..11d52ce 100644 --- a/Data/Encoding.hs +++ b/Data/Encoding.hs @@ -19,6 +19,7 @@ module Data.Encoding ,decodeStrictByteString ,decodeStrictByteStringExplicit ,encodingFromString + ,encodingFromStringExplicit ) where @@ -125,8 +126,8 @@ decodeStrictByteStringExplicit :: Encoding enc => enc -> BS.ByteString -> Either decodeStrictByteStringExplicit e str = evalStateT (decode e) str -- | Like 'encodingFromString' but returns 'Nothing' instead of throwing an error -encodingFromStringMaybe :: String -> Maybe DynEncoding -encodingFromStringMaybe codeName = case (normalizeEncoding codeName) of +encodingFromStringExplicit :: String -> Maybe DynEncoding +encodingFromStringExplicit codeName = case (normalizeEncoding codeName) of -- ASCII "ascii" -> Just $ DynEncoding ASCII "646" -> Just $ DynEncoding ASCII @@ -321,4 +322,4 @@ encodingFromString :: String -> DynEncoding encodingFromString str = maybe (error $ "Data.Encoding.encodingFromString: Unknown encoding: "++show str) id - (encodingFromStringMaybe str) \ No newline at end of file + (encodingFromStringExplicit str)