From 8fc47edf99b1fd0e9843958b73acee2f577966e1 Mon Sep 17 00:00:00 2001
From: Oleg Grenrus <oleg.grenrus@iki.fi>
Date: Thu, 23 Jan 2020 13:14:24 +0200
Subject: [PATCH] Remove deprecated modules (end of 2019 is passed)

---
 servant/CHANGELOG.md                                      | 5 +++++
 servant/servant.cabal                                     | 5 -----
 servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs | 6 ------
 servant/src/Servant/Utils/Links.hs                        | 6 ------
 4 files changed, 5 insertions(+), 17 deletions(-)
 delete mode 100644 servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs
 delete mode 100644 servant/src/Servant/Utils/Links.hs

diff --git a/servant/CHANGELOG.md b/servant/CHANGELOG.md
index 254d1866..6fecc9c1 100644
--- a/servant/CHANGELOG.md
+++ b/servant/CHANGELOG.md
@@ -52,6 +52,11 @@
   for cross-compiling. The benefit is small, as the doctests
   can be run other ways too (though not so conviniently).
 
+- *servant* Remove deprecated modules [1268#](https://github.com/haskell-servant/servant/pull/1268)
+  
+  - `Servant.Utils.Links` is `Servant.Links`
+  - `Servant.API.Internal.Test.ComprehensiveAPI` is `Servant.Test.ComprehensiveAPI`
+
 ### Other changes
 
 - *servant-client* *servant-client-core* *servant-http-streams* Fix Verb with headers checking content type differently [#1200](https://github.com/haskell-servant/servant/issues/1200) [#1204](https://github.com/haskell-servant/servant/pull/1204)
diff --git a/servant/servant.cabal b/servant/servant.cabal
index 9a571d45..05f9113a 100644
--- a/servant/servant.cabal
+++ b/servant/servant.cabal
@@ -74,11 +74,6 @@ library
   exposed-modules:
     Servant.Links
 
-  -- Deprecated modules, to be removed in late 2019
-  exposed-modules:
-    Servant.Utils.Links
-    Servant.API.Internal.Test.ComprehensiveAPI
-
   -- Bundled with GHC: Lower bound to not force re-installs
   -- text and mtl are bundled starting with GHC-8.4
   --
diff --git a/servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs b/servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs
deleted file mode 100644
index ee2609ca..00000000
--- a/servant/src/Servant/API/Internal/Test/ComprehensiveAPI.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Servant.API.Internal.Test.ComprehensiveAPI
-    {-# DEPRECATED "Use Servant.TestComprehensiveAPI" #-}
-    ( module Servant.Test.ComprehensiveAPI )
-  where
-
-import Servant.Test.ComprehensiveAPI
diff --git a/servant/src/Servant/Utils/Links.hs b/servant/src/Servant/Utils/Links.hs
deleted file mode 100644
index dc6d1b71..00000000
--- a/servant/src/Servant/Utils/Links.hs
+++ /dev/null
@@ -1,6 +0,0 @@
-module Servant.Utils.Links
-    {-# DEPRECATED "Use Servant.Links." #-}
-    ( module Servant.Links )
-  where
-
-import           Servant.Links