Removed "textual" dependency

src/Walrus/Backend.hs

@@ -14,8 +14,8 @@ import qualified Data.Attoparsec.ByteString.Lazy as LA
 import Data.Attoparsec.ByteString.Char8.Extras
 import qualified Data.ByteString.Lazy as LBS
 import qualified Data.Char as C
-import Data.Textual.Class
 import Control.Monad.IO.Class
+import Text.StringConvert
 import Control.Lens
 
 import Walrus.Backend.Metadata
@@ -53,7 +53,7 @@ parseBackend = A.choice [
       A.stringCI t
       skipHorizontalSpace
     tillSpace :: A.Parser String
-    tillSpace = fromTextual <$> A.takeTill C.isSpace
+    tillSpace = s <$> A.takeTill C.isSpace
     parseParameters :: A.Parser [String]
     parseParameters = do
       p <- qStr
@@ -62,13 +62,13 @@ parseBackend = A.choice [
         pp <- parseParameters
         return $ p : pp
     qStr :: A.Parser String
-    qStr = fromTextual <$> quotedString '\\' " " ""
+    qStr = s <$> quotedString '\\' " " ""
 
 callBackend :: Backend -> (Metadata, LBS.ByteString) -> IO (Either String (Metadata, LBS.ByteString))
 callBackend b (m, qdt) = do
   let rm = renderMetadata m
   edt' <- intBk b $ LBS.concat [
-    fromTextual rm,
+    s rm,
     qdt]
   case LA.parse repParse edt' of
     LA.Fail _ _ e -> return $ Left e

src/Walrus/Backend/Metadata.hs

@@ -10,7 +10,6 @@ import SMTP.Address
 import SMTP.Account
 import qualified SMTP.Mime as Mime
 import SMTP.Response
-import Data.Textual.Class
 import Text.StringConvert
 
 import Data.Time.ISO8601
@@ -112,14 +111,14 @@ renderMetadata m = BS.concat serialize
         "Action: ", show act, "\r\n",
         "Client-Ip: ", show $ cid^.clientIp, "\r\n",
         "Client-Port: ", show $ cid^.clientPort, "\r\n",
-        "Client-Name: ", fromTextual cnm, "\r\n",
-        "Return-Path: ", fromTextual . normalAccountName $ rfm, "\r\n",
+        "Client-Name: ", s cnm, "\r\n",
+        "Return-Path: ", s . normalAccountName $ rfm, "\r\n",
         "Recv-Date: ", formatISO8601 rcv, "\r\n",
         "Body-Encoding: ", show enc, "\r\n",
         "SMTP-UTF8: ", if utf then "Yes" else "No", "\r\n",
         "Data-Size: ", show sz, "\r\n"
         ] :: [String]
-      in map fromTextual h ++ toStr ++ failStr ++ usrStr ++ unrec ++ ["\r\n"]
+      in map s h ++ toStr ++ failStr ++ usrStr ++ unrec ++ ["\r\n"]
 
 -- | Reads a metadata from a textual representation on the format expected by the walrus backends
 parseMetadata :: A.Parser Metadata
@@ -223,12 +222,12 @@ parseMetadata = do
     parseRead :: Read a => Parser a
     parseRead = do
       v <- A.takeTill A.isSpace
-      case readMaybe . fromTextual $ v of
+      case readMaybe . s $ v of
         Nothing -> fail "failed parsing value"
         Just i -> return i
     parseISO8601Val = do
       v <- A.takeTill A.isSpace
-      case parseISO8601 . fromTextual $ v of
+      case parseISO8601 . s $ v of
         Nothing -> fail "failed parsing ISO8601 date"
         Just t -> return t
     parseMetadataBool :: Parser Bool

walrus-backend.cabal

@@ -37,7 +37,6 @@ library
     iso8601-time,
     string-convert,
     tools-for-attoparsec,
-    textual,
     hssealtools,
     uniform-io >= 1.1.1
   hs-source-dirs:      src