git.iko.soy/monoidal-containers
on master help sign in
Merge pull request #60 from endgame/unalign

Derive Unalign instances

commitf450908f505ec5b0cf3375c58b2feaffae14395e authorBen Gamari <ben@smart-cactus.org> dateFri 16 Oct 2020, 22:31 (6 years ago) parent6088c6fb8b6d27
6 files changed+11−4
compare with master
unifiedsplit
monoidal-containers.cabal−1 src/Data/HashMap/Monoidal.hs+2 src/Data/IntMap/Monoidal.hs+2 src/Data/IntMap/Monoidal/Strict.hs+3−1 src/Data/Map/Monoidal.hs+2 src/Data/Map/Monoidal/Strict.hs+2−2
monoidal-containers.cabal−1
@@ -59,7 +59,6 @@ library
5959 if flag(split-these)
6060 build-depends: these >= 1 && <1.2,
6161 semialign >=1 && <1.2
62−
6362 else
6463 build-depends: these >= 0.7 && <0.9
6564
src/Data/HashMap/Monoidal.hs+2
@@ -61,6 +61,7 @@ import Control.Lens
6161import Control.Newtype
6262import Data.Align
6363#ifdef MIN_VERSION_semialign
64+import Data.Semialign (Unalign)
6465#if MIN_VERSION_semialign(1,1,0)
6566import Data.Zip (Zip)
6667#endif
@@ -77,6 +78,7 @@ newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap
7778 , Semialign
7879#endif
7980#ifdef MIN_VERSION_semialign
81+ , Unalign
8082#if MIN_VERSION_semialign(1,1,0)
8183 , Zip
8284#endif
src/Data/IntMap/Monoidal.hs+2
@@ -152,6 +152,7 @@ import Data.Functor.Classes
152152#endif
153153import Data.Align
154154#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
155156#if MIN_VERSION_semialign(1,1,0)
156157import Data.Zip (Zip)
157158#endif
@@ -167,6 +168,7 @@ newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }
167168 , Semialign
168169#endif
169170#ifdef MIN_VERSION_semialign
171+ , Unalign
170172#if MIN_VERSION_semialign(1,1,0)
171173 , Zip
172174#endif
src/Data/IntMap/Monoidal/Strict.hs+3−1
@@ -152,6 +152,7 @@ import Data.Functor.Classes
152152#endif
153153import Data.Align
154154#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
155156#if MIN_VERSION_semialign(1,1,0)
156157import Data.Zip (Zip)
157158#endif
@@ -164,9 +165,10 @@ newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }
164165 FromJSON, ToJSON, FromJSON1, ToJSON1,
165166 Data, Typeable, Align
166167#if MIN_VERSION_these(0,8,0)
167− , Semialign
168+ , Semialign
168169#endif
169170#ifdef MIN_VERSION_semialign
171+ , Unalign
170172#if MIN_VERSION_semialign(1,1,0)
171173 , Zip
172174#endif
src/Data/Map/Monoidal.hs+2
@@ -152,6 +152,7 @@ import Data.Functor.Classes
152152#endif
153153import Data.Align
154154#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
155156#if MIN_VERSION_semialign(1,1,0)
156157import Data.Zip (Zip)
157158#endif
@@ -167,6 +168,7 @@ newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
167168 , Semialign
168169#endif
169170#ifdef MIN_VERSION_semialign
171+ , Unalign
170172#if MIN_VERSION_semialign(1,1,0)
171173 , Zip
172174#endif
src/Data/Map/Monoidal/Strict.hs+2−2
@@ -152,6 +152,7 @@ import Data.Functor.Classes
152152#endif
153153import Data.Align
154154#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
155156#if MIN_VERSION_semialign(1,1,0)
156157import Data.Zip (Zip)
157158#endif
@@ -167,6 +168,7 @@ newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
167168 , Semialign
168169#endif
169170#ifdef MIN_VERSION_semialign
171+ , Unalign
170172#if MIN_VERSION_semialign(1,1,0)
171173 , Zip
172174#endif
@@ -697,5 +699,3 @@ maxViewWithKey = coerce (M.maxViewWithKey :: M.Map k a -> Maybe ((k, a), M.Map k
697699valid :: forall k a. Ord k => MonoidalMap k a -> Bool
698700valid = coerce (M.valid :: Ord k => M.Map k a -> Bool)
699701{-# INLINE valid #-}
700−
701−