From 82e0b04e4dfbb043fa39f1869821087dd2fafb9f Mon Sep 17 00:00:00 2001 From: Stephen Diehl Date: Tue, 15 Nov 2016 14:57:16 +0000 Subject: [PATCH] use default monoid (<>) instead of semigroup --- src/Protolude.hs | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/src/Protolude.hs b/src/Protolude.hs index 18729c197..73ed2bd29 100644 --- a/src/Protolude.hs +++ b/src/Protolude.hs @@ -102,8 +102,19 @@ import Semiring as X import Data.Functor.Identity as X #if ( __GLASGOW_HASKELL__ >= 800 ) -import Data.Monoid as X hiding ((<>)) -import Data.Semigroup as X ( Semigroup(..) ) +import Data.Monoid as X +import Data.Semigroup as X ( + Semigroup(sconcat, stimes) + , WrappedMonoid + , Option(..) + , option + , diff + , cycle1 + , stimesMonoid + , stimesIdempotent + , stimesIdempotentMonoid + , mtimesDefault + ) #else import Data.Monoid as X #endif