git.iko.soy/typeable/servant
on master help sign in
Improve formatting of haddock
dc4b4beOleg Grenrus
servant/src/Servant/API/Alternative.hs+4
@@ -7,6 +7,7 @@
7{-# OPTIONS_HADDOCK not-home #-}
7{-# OPTIONS_HADDOCK not-home #-}
8module Servant.API.Alternative ((:<|>)(..)) where
8module Servant.API.Alternative ((:<|>)(..)) where
9
9
10+import Data.Semigroup (Semigroup (..))
10import Data.Typeable (Typeable)
11import Data.Typeable (Typeable)
11import Prelude ()
12import Prelude ()
12import Prelude.Compat
13import Prelude.Compat
@@ -23,6 +24,9 @@ data a :<|> b = a :<|> b
23 deriving (Typeable, Eq, Show, Functor, Traversable, Foldable, Bounded)
24 deriving (Typeable, Eq, Show, Functor, Traversable, Foldable, Bounded)
24infixr 8 :<|>
25infixr 8 :<|>
25
26
27+instance (Semigroup a, Semigroup b) => Semigroup (a :<|> b) where
28+ (a :<|> b) <> (a' :<|> b') = (a <> a') :<|> (b <> b')
29+
26instance (Monoid a, Monoid b) => Monoid (a :<|> b) where
30instance (Monoid a, Monoid b) => Monoid (a :<|> b) where
27 mempty = mempty :<|> mempty
31 mempty = mempty :<|> mempty
28 (a :<|> b) `mappend` (a' :<|> b') = (a `mappend` a') :<|> (b `mappend` b')
32 (a :<|> b) `mappend` (a' :<|> b') = (a `mappend` a') :<|> (b `mappend` b')
servant/src/Servant/Utils/Links.hs+1−1
@@ -82,7 +82,7 @@ module Servant.Utils.Links (
82
82
83 -- * Building and using safe links
83 -- * Building and using safe links
84 --
84 --
85− -- | Note that 'URI' is Network.URI.URI from the network-uri package.
85+ -- | Note that 'URI' is from the "Network.URI" module in the @network-uri@ package.
86 safeLink
86 safeLink
87 , URI(..)
87 , URI(..)
88 -- * Adding custom types
88 -- * Adding custom types