Pull weeds

package.yaml

@@ -57,7 +57,6 @@ library:
     - microlens
     - microlens-mtl
     - opt-env-conf
-    - optparse-applicative
     - path
     - relude
     - semigroups

restyler.cabal

@@ -34,7 +34,6 @@ library
       Restyler.Monad.Git
       Restyler.Monad.ReadFile
       Restyler.Monad.WriteFile
-      Restyler.Opt
       Restyler.Options
       Restyler.Options.DryRun
       Restyler.Options.FailOnDifferences
@@ -96,7 +95,6 @@ library
     , microlens
     , microlens-mtl
     , opt-env-conf
-    , optparse-applicative
     , path
     , relude
     , semigroups

src/Restyler/AnnotatedException.hs

@@ -17,10 +17,6 @@ module Restyler.AnnotatedException
   , hide
   , displayAnnotatedException
 
-    -- * Annotated-safe handling
-  , handleTo
-  , tryTo
-
     -- * Suppressing exception
   , suppressWith
   , suppressWarn
@@ -39,17 +35,6 @@ displayAnnotatedException aex@AnnotatedException {exception} =
     , maybe "" (pack . prettyCallStack) $ annotatedExceptionCallStack aex
     ]
 
-handleTo
-  :: (MonadUnliftIO m, Exception e1, Exception e2) => (e1 -> e2) -> m a -> m a
-handleTo f action = do
-  r <- tryAnnotated action
-  case r of
-    Left AnnotatedException {exception} -> throw $ f exception
-    Right a -> pure a
-
-tryTo :: (MonadUnliftIO m, Exception e) => (e -> b) -> m a -> m (Either b a)
-tryTo f = fmap (first $ f . exception) . tryAnnotated
-
 -- | Suppress any exception and return the given @a@
 suppressWith :: MonadUnliftIO m => a -> m a -> m a
 suppressWith x = either (const $ pure x) pure <=< tryAnnotated @SomeException

src/Restyler/Prelude.hs

@@ -36,10 +36,7 @@ import UnliftIO.Exception as X (finally)
 import UnliftIO.Temporary as X (withSystemTempDirectory)
 
 import Blammo.Logging.Logger (flushLogger)
-import Data.Aeson (Key)
-import Data.Aeson.KeyMap (KeyMap)
-import Data.Aeson.KeyMap qualified as KeyMap
-import Data.List (minimum, minimumBy, (!!))
+import Data.List (minimum)
 
 logTrace :: (MonadLogger m, HasCallStack) => Message -> m ()
 logTrace = logOther $ LevelOther "trace"
@@ -66,22 +63,6 @@ minimumMaybe = \case
   [] -> Nothing
   xs -> Just $ minimum xs
 
-minimumByMaybe :: (a -> a -> Ordering) -> [a] -> Maybe a
-minimumByMaybe f = \case
-  [] -> Nothing
-  xs -> Just $ minimumBy f xs
-
--- | Safe version of '(!!)'
-(!?) :: [a] -> Int -> Maybe a
-xs !? i
-  | length xs > i = Just $ xs !! i
-  | otherwise = Nothing
-
-infixl 9 !?
-
 -- | Inverse of @'any'@
 none :: Foldable t => (a -> Bool) -> t a -> Bool
 none p = not . any p
-
-insertIfMissing :: Key -> v -> KeyMap v -> KeyMap v
-insertIfMissing k v m = KeyMap.unionWith const m $ KeyMap.singleton k v