From 89116d794eb0b90a6ea8ab0ac200075255fa4749 Mon Sep 17 00:00:00 2001
From: Jens Nolte <git@queezle.net>
Date: Thu, 10 Feb 2022 20:04:39 +0100
Subject: [PATCH] Fix warnings
---
src/Quasar/Disposable.hs | 2 --
src/Quasar/ResourceManager.hs | 6 +++---
src/Quasar/Utils/TOnce.hs | 3 ++-
3 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/src/Quasar/Disposable.hs b/src/Quasar/Disposable.hs
index fe86e94..d232f2d 100644
--- a/src/Quasar/Disposable.hs
+++ b/src/Quasar/Disposable.hs
@@ -33,13 +33,11 @@ import Control.Concurrent (forkIO)
import Control.Concurrent.STM
import Control.Monad.Catch
import Control.Monad.Reader
-import Data.List.NonEmpty (nonEmpty)
import Data.HashSet (HashSet)
import Data.HashSet qualified as HashSet
import GHC.Conc (unsafeIOToSTM)
import Quasar.Awaitable
import Quasar.Prelude
-import Quasar.Utils.Exceptions
-- * Disposable
diff --git a/src/Quasar/ResourceManager.hs b/src/Quasar/ResourceManager.hs
index 6a04c4c..0755f0e 100644
--- a/src/Quasar/ResourceManager.hs
+++ b/src/Quasar/ResourceManager.hs
@@ -52,7 +52,7 @@ import Control.Monad.Reader
import Data.Foldable (toList)
import Data.HashMap.Strict (HashMap)
import Data.HashMap.Strict qualified as HM
-import Data.List.NonEmpty (NonEmpty(..), (<|), nonEmpty)
+import Data.List.NonEmpty ((<|), nonEmpty)
import Data.Sequence (Seq(..), (|>))
import Data.Sequence qualified as Seq
import Quasar.Async.Unmanaged
@@ -221,7 +221,7 @@ captureDisposable :: MonadResourceManager m => m a -> m (a, Disposable)
captureDisposable action = do
resourceManager <- newResourceManager
result <- localResourceManager resourceManager action
- pure $ (result, toDisposable resourceManager)
+ pure (result, toDisposable resourceManager)
captureDisposable_ :: MonadResourceManager m => m () -> m Disposable
captureDisposable_ = snd <<$>> captureDisposable
@@ -442,7 +442,7 @@ instance IsDisposable ResourceManagerCore where
state <- readTVar stateVar
case state of
ResourceManagerNormal -> do
- writeTVar stateVar $ ResourceManagerDisposing
+ writeTVar stateVar ResourceManagerDisposing
readTVar lockVar >>= \case
0 -> do
disposables <- takeDisposables
diff --git a/src/Quasar/Utils/TOnce.hs b/src/Quasar/Utils/TOnce.hs
index bd1dba8..9401315 100644
--- a/src/Quasar/Utils/TOnce.hs
+++ b/src/Quasar/Utils/TOnce.hs
@@ -13,7 +13,8 @@ import Quasar.Awaitable
import Quasar.Prelude
data TOnceAlreadyFinalized = TOnceAlreadyFinalized
- deriving (Eq, Show, Exception)
+ deriving stock (Eq, Show)
+ deriving anyclass Exception
newtype TOnce a b = TOnce (TVar (Either a b))
--
GitLab