From f11d5207e412670a1573aa3e2b58d2ff8d4148e1 Mon Sep 17 00:00:00 2001 From: Matthias Fischmann Date: Tue, 24 Feb 2015 08:54:14 +0100 Subject: [PATCH] Dropped orphan instance for MediaType (now available upstream). --- servant-docs.cabal | 2 +- src/Servant/Docs.hs | 6 ------ 2 files changed, 1 insertion(+), 7 deletions(-) diff --git a/servant-docs.cabal b/servant-docs.cabal index 32c18230..48e5271c 100644 --- a/servant-docs.cabal +++ b/servant-docs.cabal @@ -31,7 +31,7 @@ library , aeson , bytestring , hashable - , http-media + , http-media >= 0.6 , lens , servant >= 0.2.1 , string-conversions diff --git a/src/Servant/Docs.hs b/src/Servant/Docs.hs index 936a8020..945f1e62 100644 --- a/src/Servant/Docs.hs +++ b/src/Servant/Docs.hs @@ -209,12 +209,6 @@ import qualified Data.HashMap.Strict as HM import qualified Data.Text as T import qualified Network.HTTP.Media as M --- | Temporary orphan. Can be eliminated as soon as --- https://github.com/zmthy/http-media/pull/12 has been released. --- (Also consider removing StandaloneDeriving language ext above.) -instance Ord M.MediaType where - compare t t' = compare (show t) (show t') - -- | Supported HTTP request methods data Method = DocDELETE -- ^ the DELETE method | DocGET -- ^ the GET method