server: add tshow :: Show a => a -> Text, including hlint hint (#142)

hasura · Dec 8, 2020 · 627a555 · 627a555
1 parent 8c80998
commit 627a555
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 4 deletions.
diff --git a/server/.hlint.yaml b/server/.hlint.yaml
@@ -110,6 +110,7 @@
     - warn: {lhs: "case x of {Nothing -> a; Just b -> return b}", rhs: "onNothing x a"}
     - warn: {lhs: "case x of {Just b -> return b; Nothing -> a}", rhs: "onNothing x a"}
     - warn: {lhs: "fromMaybe [] x", rhs: "maybeToList x"}
+    - warn: {lhs: "Data.Text.pack (Prelude.show x)", rhs: "Hasura.Prelude.tshow x"}
 
 - group:
     name: data-text-extended

diff --git a/server/src-lib/Hasura/Prelude.hs b/server/src-lib/Hasura/Prelude.hs
@@ -16,6 +16,7 @@ module Hasura.Prelude
   , spanMaybeM
   , liftEitherM
   , hoistMaybe
+  , tshow
   -- * Efficient coercions
   , coerce
   , findWithIndex
@@ -184,3 +185,6 @@ startTimer = do
 -- copied from http://hackage.haskell.org/package/errors-2.3.0/docs/src/Control.Error.Util.html#hoistMaybe
 hoistMaybe :: (Monad m) => Maybe b -> MaybeT m b
 hoistMaybe = MaybeT . return
+
+tshow :: Show a => a -> Text
+tshow = T.pack . show
diff --git a/server/src-lib/Network/URI/Extended.hs b/server/src-lib/Network/URI/Extended.hs
@@ -1,7 +1,7 @@
 {-# OPTIONS_GHC -fno-warn-orphans #-}
 
 module Network.URI.Extended
-  (module Network.URI
+  ( module Network.URI
   )
   where
 
@@ -20,10 +20,10 @@ instance {-# INCOHERENT #-} FromJSON URI where
   parseJSON _ = fail "not a valid URI"
 
 instance {-# INCOHERENT #-} ToJSON URI where
-  toJSON = String . T.pack . show
+  toJSON = String . tshow
 
 instance {-# INCOHERENT #-} ToJSONKey URI where
-  toJSONKey = toJSONKeyText (T.pack . show)
+  toJSONKey = toJSONKeyText tshow
 
 instance Hashable URI where
-  hashWithSalt i = hashWithSalt i . (T.pack . show)
+  hashWithSalt i = hashWithSalt i . tshow