git.iko.soy/gogol
on develop help sign in
Merge branch 'develop' into feature/conduit-upgrade-2
45b383bMichael Xavier
core/src/Network/Google/Types.hs+5−2
compare with develop
unifiedsplit
@@ -37,7 +37,7 @@ import Data.Conduit
37import Data.Data
37import Data.Data
38import Data.DList (DList)
38import Data.DList (DList)
39import Data.Foldable (foldMap, foldl')
39import Data.Foldable (foldMap, foldl')
40−import Data.Monoid
40+import Data.Semigroup
41import Data.String
41import Data.String
42import Data.Text (Text)
42import Data.Text (Text)
43import Data.Text.Lazy.Builder (Builder)
43import Data.Text.Lazy.Builder (Builder)
@@ -310,7 +310,10 @@ data Request = Request
310
310
311instance Monoid Request where
311instance Monoid Request where
312 mempty = Request mempty mempty mempty mempty
312 mempty = Request mempty mempty mempty mempty
313+ mappend = (<>)
314+
315+instance Semigroup Request where
313− mappend a b = Request
316+ a <> b = Request
314 (_rqPath a <> "/" <> _rqPath b)
317 (_rqPath a <> "/" <> _rqPath b)
315 (_rqQuery a <> _rqQuery b)
318 (_rqQuery a <> _rqQuery b)
316 (_rqHeaders a <> _rqHeaders b)
319 (_rqHeaders a <> _rqHeaders b)
gen/stack.yamlnew file+16
@@ -0,0 +1,16 @@
1+compiler: ghc-8.0.2
2+resolver: lts-8.18
3+
4+flags: {}
5+
6+extra-deps:
7+ - text-regex-replace-0.1.1.1
8+ - haskell-src-exts-1.17.1
9+ - hindent-4.6.4
10+
11+packages:
12+ - '.'
13+
14+nix:
15+ enable: true
16+ packages: [zlib, icu]