git.iko.soy/monoidal-containers
on master help sign in
Merge pull request #60 from endgame/unalign
f450908Ben Gamari
monoidal-containers.cabal−1
compare with master
unifiedsplit
@@ -59,7 +59,6 @@ library
59 if flag(split-these)
59 if flag(split-these)
60 build-depends: these >= 1 && <1.2,
60 build-depends: these >= 1 && <1.2,
61 semialign >=1 && <1.2
61 semialign >=1 && <1.2
62−
63 else
62 else
64 build-depends: these >= 0.7 && <0.9
63 build-depends: these >= 0.7 && <0.9
65
64
src/Data/HashMap/Monoidal.hs+2
@@ -61,6 +61,7 @@ import Control.Lens
61import Control.Newtype
61import Control.Newtype
62import Data.Align
62import Data.Align
63#ifdef MIN_VERSION_semialign
63#ifdef MIN_VERSION_semialign
64+import Data.Semialign (Unalign)
64#if MIN_VERSION_semialign(1,1,0)
65#if MIN_VERSION_semialign(1,1,0)
65import Data.Zip (Zip)
66import Data.Zip (Zip)
66#endif
67#endif
@@ -77,6 +78,7 @@ newtype MonoidalHashMap k a = MonoidalHashMap { getMonoidalHashMap :: M.HashMap
77 , Semialign
78 , Semialign
78#endif
79#endif
79#ifdef MIN_VERSION_semialign
80#ifdef MIN_VERSION_semialign
81+ , Unalign
80#if MIN_VERSION_semialign(1,1,0)
82#if MIN_VERSION_semialign(1,1,0)
81 , Zip
83 , Zip
82#endif
84#endif
src/Data/IntMap/Monoidal.hs+2
@@ -152,6 +152,7 @@ import Data.Functor.Classes
152#endif
152#endif
153import Data.Align
153import Data.Align
154#ifdef MIN_VERSION_semialign
154#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
155#if MIN_VERSION_semialign(1,1,0)
156#if MIN_VERSION_semialign(1,1,0)
156import Data.Zip (Zip)
157import Data.Zip (Zip)
157#endif
158#endif
@@ -167,6 +168,7 @@ newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }
167 , Semialign
168 , Semialign
168#endif
169#endif
169#ifdef MIN_VERSION_semialign
170#ifdef MIN_VERSION_semialign
171+ , Unalign
170#if MIN_VERSION_semialign(1,1,0)
172#if MIN_VERSION_semialign(1,1,0)
171 , Zip
173 , Zip
172#endif
174#endif
src/Data/IntMap/Monoidal/Strict.hs+3−1
@@ -152,6 +152,7 @@ import Data.Functor.Classes
152#endif
152#endif
153import Data.Align
153import Data.Align
154#ifdef MIN_VERSION_semialign
154#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
155#if MIN_VERSION_semialign(1,1,0)
156#if MIN_VERSION_semialign(1,1,0)
156import Data.Zip (Zip)
157import Data.Zip (Zip)
157#endif
158#endif
@@ -164,9 +165,10 @@ newtype MonoidalIntMap a = MonoidalIntMap { getMonoidalIntMap :: M.IntMap a }
164 FromJSON, ToJSON, FromJSON1, ToJSON1,
165 FromJSON, ToJSON, FromJSON1, ToJSON1,
165 Data, Typeable, Align
166 Data, Typeable, Align
166#if MIN_VERSION_these(0,8,0)
167#if MIN_VERSION_these(0,8,0)
167− , Semialign
168+ , Semialign
168#endif
169#endif
169#ifdef MIN_VERSION_semialign
170#ifdef MIN_VERSION_semialign
171+ , Unalign
170#if MIN_VERSION_semialign(1,1,0)
172#if MIN_VERSION_semialign(1,1,0)
171 , Zip
173 , Zip
172#endif
174#endif
src/Data/Map/Monoidal.hs+2
@@ -152,6 +152,7 @@ import Data.Functor.Classes
152#endif
152#endif
153import Data.Align
153import Data.Align
154#ifdef MIN_VERSION_semialign
154#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
155#if MIN_VERSION_semialign(1,1,0)
156#if MIN_VERSION_semialign(1,1,0)
156import Data.Zip (Zip)
157import Data.Zip (Zip)
157#endif
158#endif
@@ -167,6 +168,7 @@ newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
167 , Semialign
168 , Semialign
168#endif
169#endif
169#ifdef MIN_VERSION_semialign
170#ifdef MIN_VERSION_semialign
171+ , Unalign
170#if MIN_VERSION_semialign(1,1,0)
172#if MIN_VERSION_semialign(1,1,0)
171 , Zip
173 , Zip
172#endif
174#endif
src/Data/Map/Monoidal/Strict.hs+2−2
@@ -152,6 +152,7 @@ import Data.Functor.Classes
152#endif
152#endif
153import Data.Align
153import Data.Align
154#ifdef MIN_VERSION_semialign
154#ifdef MIN_VERSION_semialign
155+import Data.Semialign (Unalign)
155#if MIN_VERSION_semialign(1,1,0)
156#if MIN_VERSION_semialign(1,1,0)
156import Data.Zip (Zip)
157import Data.Zip (Zip)
157#endif
158#endif
@@ -167,6 +168,7 @@ newtype MonoidalMap k a = MonoidalMap { getMonoidalMap :: M.Map k a }
167 , Semialign
168 , Semialign
168#endif
169#endif
169#ifdef MIN_VERSION_semialign
170#ifdef MIN_VERSION_semialign
171+ , Unalign
170#if MIN_VERSION_semialign(1,1,0)
172#if MIN_VERSION_semialign(1,1,0)
171 , Zip
173 , Zip
172#endif
174#endif
@@ -697,5 +699,3 @@ maxViewWithKey = coerce (M.maxViewWithKey :: M.Map k a -> Maybe ((k, a), M.Map k
697valid :: forall k a. Ord k => MonoidalMap k a -> Bool
699valid :: forall k a. Ord k => MonoidalMap k a -> Bool
698valid = coerce (M.valid :: Ord k => M.Map k a -> Bool)
700valid = coerce (M.valid :: Ord k => M.Map k a -> Bool)
699{-# INLINE valid #-}
701{-# INLINE valid #-}
700−
701−