Update to lts-12.16

Author: jmatsushita

rasa-ext-slate/src/Rasa/Ext/Slate/Internal/Attributes.hs

@@ -44,10 +44,13 @@ newtype AttrMonoid = AttrMonoid {
   getAttr :: V.Attr
 }
 
+instance Semigroup AttrMonoid where
+  AttrMonoid v <> AttrMonoid v' = AttrMonoid $ v <> v'
+
+
 -- | We want 'mempty' to be 'V.defAttr' instead of 'V.currentAttr' for use in 'combineSpans'.
 instance Monoid AttrMonoid where
   mempty = AttrMonoid V.defAttr
-  AttrMonoid v `mappend` AttrMonoid v' = AttrMonoid $ v `mappend` v'
 
 -- | Apply a list of styles to the given text, resulting in a 'V.Image'.
 applyAttrs :: RenderInfo -> V.Image

rasa-ext-views/src/Rasa/Ext/Views/Internal/Widgets.hs

@@ -38,10 +38,12 @@ data Widgets = Widgets
 
 makeLenses ''Widgets
 
+instance Semigroup Widgets where
+  (Widgets a b c d) <> (Widgets a' b' c' d') =
+    Widgets (a<>a') (b<>b') (c<>c') (d<>d')
+  
 instance Monoid Widgets where
   mempty = Widgets mempty mempty mempty mempty
-  (Widgets a b c d) `mappend` (Widgets a' b' c' d') =
-    Widgets (a<>a') (b<>b') (c<>c') (d<>d')
 
 class HasWidgets r where
   computeWidgets :: r -> App Widgets

rasa/src/Rasa/Internal/Styles.hs

@@ -55,17 +55,20 @@ newtype Style = Style (Maybe Color, Maybe Color, Maybe Flair)
 instance Default Style where
   def = Style (Just DefColor, Just DefColor, Just DefFlair)
 
+instance Semigroup Style where
+  Style (a, b, c) <> Style (a', b', c') = Style (a' <|> a, b' <|> b, c' <|> c)
+
 -- | The monoid instance replaces any attributes which have a 'Just' in the new 'Style'
 -- and persists any that are 'Nothing' in the new style (using 'Data.Alternative' for 'Data.Maybe')
 instance Monoid Style where
-  Style (a, b, c) `mappend` Style (a', b', c') = Style (a' <|> a, b' <|> b, c' <|> c)
 
   mempty = Style (Nothing, Nothing, Nothing)
 
 type Styles = [Span CrdRange Style]
 newtype StyleMap =
   StyleMap Styles
   deriving (Show, Eq, Monoid)
+  deriving (Show, Eq, Semigroup, Monoid)
 
 instance Default StyleMap where
   def = StyleMap []

rasa/src/Rasa/Internal/Utility.hs

@@ -30,14 +30,16 @@ type Height = Int
 data RenderInfo =
   RenderInfo Y.YiString Styles
 
+instance Semigroup RenderInfo where
+  RenderInfo txtA stylesA <> RenderInfo txtB stylesB =
+    RenderInfo
+      (txtA <> txtB)
+      (mappend stylesA $ first (moveRange (sizeOf txtA)) <$> stylesB)
+
 -- | Appends to RenderInfo by appending the text and styles while preserving
 -- proper text/style alignment
 instance Monoid RenderInfo where
   mempty = RenderInfo mempty mempty
-  RenderInfo txtA stylesA `mappend` RenderInfo txtB stylesB =
-    RenderInfo
-      (txtA `mappend` txtB)
-      (mappend stylesA $ first (moveRange (sizeOf txtA)) <$> stylesB)
 
 -- | Represents how to render an entity
 class Renderable r where

stack.yaml

@@ -1,4 +1,5 @@
 flags: {}
+resolver: lts-12.16
 extra-package-dbs: []
 
 nix:
@@ -33,5 +34,4 @@ extra-deps:
 # extra-include-dirs:
 # - /usr/local/opt/icu4c/include
 
-resolver: lts-10.7
 pvp-bounds: both