REF use bracket

2022-12-31 19:50:32 -05:00 · 2022-12-31 19:50:32 -05:00 · c94d83f41e
parent b52b22c48d
commit c94d83f41e
1 changed files with 2 additions and 6 deletions
--- a/lib/Data/Internal/DBus.hs
+++ b/lib/Data/Internal/DBus.hs
@ -46,12 +46,8 @@ class SafeClient c where
  disconnectDBusClient = liftIO . disconnect . toClient

  withDBusClient :: MonadUnliftIO m => (c -> m a) -> m (Maybe a)
-  withDBusClient f = do
-    client <- getDBusClient
-    forM client $ \c -> do
-      r <- f c
-      liftIO $ disconnect (toClient c)
-      return r
+  withDBusClient f =
+    bracket getDBusClient (mapM (liftIO . disconnect . toClient)) $ mapM f

  withDBusClient_ :: MonadUnliftIO m => (c -> m ()) -> m ()
  withDBusClient_ = void . withDBusClient