Merge pull request #124 from rhendric/rhendric/noncanonical

Remove noncanonical definitions

Author: snoyberg

unliftio/ChangeLog.md

@@ -1,5 +1,9 @@
 # Changelog for unliftio
 
+## 0.2.25.1
+
+* Forward compatibility with `-Wnoncanonical-monoid-instances` becoming an error
+
 ## 0.2.25.0
 
 * Add `UnliftIO.Exception.Lens`

unliftio/package.yaml

@@ -1,5 +1,5 @@
 name:                unliftio
-version:             0.2.25.0
+version:             0.2.25.1
 synopsis:            The MonadUnliftIO typeclass for unlifting monads to IO (batteries included)
 description:         Please see the documentation and README at <https://www.stackage.org/package/unliftio>
 homepage:            https://github.com/fpco/unliftio/tree/master/unliftio#readme

unliftio/src/UnliftIO/Internals/Async.hs

@@ -510,8 +510,10 @@ instance (MonadUnliftIO m, Semigroup a) => Semigroup (Conc m a) where
 instance (Monoid a, MonadUnliftIO m) => Monoid (Conc m a) where
   mempty = pure mempty
   {-# INLINE mempty #-}
+#if !MIN_VERSION_base(4,11,0)
   mappend = liftA2 mappend
   {-# INLINE mappend #-}
+#endif
 
 -------------------------
 -- Conc implementation --