remove 'safe' dependencies, use Relude tools instead

freckle · Jul 30, 2024 · 35e84b5 · 35e84b5
1 parent 8de047d
commit 35e84b5
Show file tree

Hide file tree

Showing 7 changed files with 5 additions and 12 deletions.
diff --git a/freckle-http/freckle-http.cabal b/freckle-http/freckle-http.cabal
@@ -84,7 +84,6 @@ library
     , network-uri
     , relude
     , retry >=0.8.1.0
-    , safe
     , semigroupoids
     , serialise
     , text

diff --git a/freckle-http/library/Freckle/App/Http/Cache.hs b/freckle-http/library/Freckle/App/Http/Cache.hs
@@ -41,7 +41,6 @@ import Network.HTTP.Types.Header
   , hVary
   )
 import Network.HTTP.Types.Status (Status, statusCode)
-import Safe (readMay)
 
 data HttpCacheSettings m t = HttpCacheSettings
   { shared :: Bool
@@ -276,7 +275,7 @@ readCacheControl = go . CI.foldCase
   go = \case
     "private" -> Just Private
     "no-store" -> Just NoStore
-    h | Just s <- BS8.stripPrefix "max-age=" h -> MaxAge <$> readMay (BS8.unpack s)
+    h | Just s <- BS8.stripPrefix "max-age=" h -> MaxAge <$> readMaybe (BS8.unpack s)
     _ -> Nothing
 
 getCacheControl :: HasHeaders a => a -> [CacheControl]
@@ -316,7 +315,7 @@ getResponseHeaders resp =
     { cacheControl = getCacheControl resp
     , age = fromMaybe 0 $ do
         h <- lookupHeader hAge resp
-        readMay $ BS8.unpack h
+        readMaybe $ BS8.unpack h
     , expires = do
         h <- lookupHeader hExpires resp
         parseTimeM True defaultTimeLocale httpDateFormat $ BS8.unpack h

diff --git a/freckle-http/library/Freckle/App/Test/Http.hs b/freckle-http/library/Freckle/App/Test/Http.hs
@@ -49,6 +49,7 @@ import Control.Lens (Lens', lens, view,  (.~), (<>~))
 import Data.Aeson (ToJSON, encode)
 import Data.ByteString.Lazy qualified as BSL
 import Data.List (stripPrefix)
+import Data.Traversable (for)
 import Freckle.App.Http (MonadHttp (..))
 import Freckle.App.Test.Http.MatchRequest
 import Network.HTTP.Client (Request, Response)
@@ -58,8 +59,6 @@ import Network.HTTP.Types.Status (Status, status200)
 import System.Directory (doesFileExist)
 import System.FilePath (addTrailingPathSeparator)
 import System.FilePath.Glob (globDir1)
-import Safe(headMay)
-import Data.Traversable   (for)
 
 -- | Respond to a 'Request' with the first 'HttpStub' to match
 --
@@ -82,7 +81,7 @@ httpStubbed
   -> Request
   -> Response BSL.ByteString
 httpStubbed stubs req =
-  maybe (error errorMessage) (toResponse req) $ headMay matched
+  maybe (error errorMessage) (toResponse req) $ viaNonEmpty head matched
  where
   (unmatched, matched) =
     partitionEithers

diff --git a/freckle-http/package.yaml b/freckle-http/package.yaml
@@ -82,7 +82,6 @@ library:
     - network-uri
     - relude
     - retry >= 0.8.1.0 # retryingDynamic
-    - safe
     - serialise
     - semigroupoids
     - text

diff --git a/freckle-memcached/freckle-memcached.cabal b/freckle-memcached/freckle-memcached.cabal
@@ -112,7 +112,6 @@ test-suite spec
     , lens-aeson
     , memcache
     , relude
-    , safe
     , text
     , unliftio
   default-language: GHC2021

diff --git a/freckle-memcached/package.yaml b/freckle-memcached/package.yaml
@@ -93,6 +93,5 @@ tests:
       - lens-aeson
       - memcache
       - relude
-      - safe
       - text
       - unliftio
diff --git a/freckle-memcached/tests/Freckle/App/Memcached/ServersSpec.hs b/freckle-memcached/tests/Freckle/App/Memcached/ServersSpec.hs
@@ -7,7 +7,6 @@ import Relude
 import Control.Error.Util (hush)
 import Database.Memcache.Client qualified as Memcache
 import Freckle.App.Memcached.Servers
-import Safe (headMay)
 import Test.Hspec
 
 spec :: Spec
@@ -75,7 +74,7 @@ spec = do
           [Memcache.NoAuth, Memcache.NoAuth, Memcache.Auth "u" "p"]
 
 readServerSpec :: String -> Maybe Memcache.ServerSpec
-readServerSpec = headMay <=< readServerSpecs
+readServerSpec = viaNonEmpty head <=< readServerSpecs
 
 readServerSpecs :: String -> Maybe [Memcache.ServerSpec]
 readServerSpecs = fmap toServerSpecs . hush . readMemcachedServers