From 63b6edc526bd6f24e7d12aedbe7f9362006f9dbe Mon Sep 17 00:00:00 2001 From: vrom911 Date: Sat, 25 Nov 2017 18:15:41 +0300 Subject: [PATCH] [#79] Import (<>) from Semogroup not Monoid --- CHANGES.md | 5 +++++ src/Universum.hs | 6 +++--- universum.cabal | 2 +- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 1f5733e..9623b05 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,3 +1,8 @@ +0.9.0 +===== +* [#79](https://github.com/serokell/universum/issues/79): + Import '(<>)' from Semigroup, not Monoid. + 0.8.0 ===== diff --git a/src/Universum.hs b/src/Universum.hs index 883d89c..7867a27 100644 --- a/src/Universum.hs +++ b/src/Universum.hs @@ -74,13 +74,13 @@ import Data.Traversable as X (Traversable (..), fmapDefault, #if ( __GLASGOW_HASKELL__ >= 800 ) import Data.List.NonEmpty as X (NonEmpty (..), nonEmpty) -import Data.Monoid as X -import Data.Semigroup as X (Option (..), Semigroup (sconcat, stimes), +import Data.Monoid as X hiding ((<>)) +import Data.Semigroup as X (Option (..), Semigroup (sconcat, stimes, (<>)), WrappedMonoid, cycle1, mtimesDefault, stimesIdempotent, stimesIdempotentMonoid, stimesMonoid) #else -import Data.Monoid as X +import Data.Monoid as X hiding ((<>)) #endif -- Deepseq diff --git a/universum.cabal b/universum.cabal index 201513e..6c387c5 100644 --- a/universum.cabal +++ b/universum.cabal @@ -1,5 +1,5 @@ name: universum -version: 0.8.0 +version: 0.9.0 synopsis: Custom prelude used in Serokell description: Custom prelude used in Serokell homepage: https://github.com/serokell/universum