Code clean-up using convertible-text

[Lucu.git] / Network / HTTP / Lucu / MIMEType.hs

diff --git a/Network/HTTP/Lucu/MIMEType.hs b/Network/HTTP/Lucu/MIMEType.hs
index 9c34c50e634cdd1360d26d221ada577c49b64aa2..68e9b255e54b0d1fdac608b97cd54ccbb28b5481 100644 (file)
--- a/Network/HTTP/Lucu/MIMEType.hs
+++ b/Network/HTTP/Lucu/MIMEType.hs
@@ -9,7 +9,6 @@
 -- (<http://tools.ietf.org/html/rfc2046>).
 module Network.HTTP.Lucu.MIMEType
     ( MIMEType(..)
-    , mkMIMEType
 
     , parseMIMEType
     , printMIMEType
@@ -22,13 +21,16 @@ import Control.Applicative
 import Data.Ascii (Ascii, AsciiBuilder, CIAscii)
 import qualified Data.Ascii as A
 import Data.Attoparsec.Char8 as P
+import Data.Convertible.Base
+import Data.Convertible.Instances.Ascii ()
+import Data.Convertible.Utils
 import Data.Monoid.Unicode
 import Data.Typeable
 import Language.Haskell.TH.Syntax
 import Network.HTTP.Lucu.MIMEParams
+import Network.HTTP.Lucu.OrphanInstances ()
 import Network.HTTP.Lucu.Parser
 import Network.HTTP.Lucu.Parser.Http
-import Network.HTTP.Lucu.Utils
 import Prelude.Unicode
 
 -- |A media type, subtype, and parameters.
@@ -43,18 +45,12 @@ data MIMEType
 instance Lift MIMEType where
     lift (MIMEType {..})
         = [| MIMEType {
-               mtMedia  = $(liftCIAscii mtMedia)
-             , mtSub    = $(liftCIAscii mtSub)
+               mtMedia  = $(lift mtMedia )
+             , mtSub    = $(lift mtSub   )
              , mtParams = $(lift mtParams)
              }
            |]
 
--- |@'mkMIMEType' media sub@ returns a 'MIMEType' with the given
--- @media@ and @sub@ types but without any parameters.
-mkMIMEType ∷ CIAscii → CIAscii → MIMEType
-{-# INLINE mkMIMEType #-}
-mkMIMEType = flip flip (∅) ∘ MIMEType
-
 -- |Convert a 'MIMEType' to an 'AsciiBuilder'.
 printMIMEType ∷ MIMEType → AsciiBuilder
 {-# INLINEABLE printMIMEType #-}
@@ -62,7 +58,7 @@ printMIMEType (MIMEType {..})
     = A.toAsciiBuilder (A.fromCIAscii mtMedia) ⊕
       A.toAsciiBuilder "/" ⊕
       A.toAsciiBuilder (A.fromCIAscii mtSub) ⊕
-      printMIMEParams mtParams
+      cs mtParams
 
 -- |Parse 'MIMEType' from an 'Ascii'. This function throws an
 -- exception for parse error. For literals consider using
@@ -72,7 +68,7 @@ parseMIMEType ∷ Ascii → MIMEType
 parseMIMEType str
     = case parseOnly (finishOff mimeType) $ A.toByteString str of
         Right  t → t
-        Left err → error ("unparsable MIME Type: " ⧺ A.toString str ⧺ ": " ⧺ err)
+        Left err → error ("Unparsable MIME Type: " ⧺ A.toString str ⧺ ": " ⧺ err)
 
 -- |'Parser' for an 'MIMEType'.
 mimeType ∷ Parser MIMEType