Merge pull request #1565 from haskell-servant/re-export

Re-export Servant.API.Generic in Servant.API

Author: Gaël Deest

servant-server/example/greet.hs

@@ -18,7 +18,6 @@ import           Network.Wai.Handler.Warp
 
 import           Servant
 import           Servant.Server.Generic ()
-import           Servant.API.Generic
 
 -- * Example
 

servant/src/Servant/API.hs

@@ -38,6 +38,7 @@ module Servant.API (
 
   -- * Sub-APIs defined as records of routes
   module Servant.API.NamedRoutes,
+  module Servant.API.Generic,
 
   -- * Streaming endpoints, distinguished by HTTP method
   module Servant.API.Stream,
@@ -102,6 +103,9 @@ import           Servant.API.Fragment
                  (Fragment)
 import           Servant.API.Header
                  (Header, Header')
+import           Servant.API.Generic
+                 (GenericMode ((:-)), AsApi, ToServant, ToServantApi, GServantProduct,
+                 GenericServant, fromServant, toServant, genericApi)
 import           Servant.API.HttpVersion
                  (HttpVersion (..))
 import           Servant.API.IsSecure