Rename server lens to server_

GetShopTV · Jul 10, 2020 · f205201 · f205201
1 parent ff87915
commit f205201
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 1 deletion.
diff --git a/src/Data/Swagger/Internal/Utils.hs b/src/Data/Swagger/Internal/Utils.hs
@@ -45,6 +45,7 @@ swaggerFieldRules = defaultFieldRules & lensField %~ swaggerFieldNamer
     fixName' "enum"     = "enum_"     -- Control.Lens conflict
     fixName' "head"     = "head_"     -- Prelude conflict
     fixName' "not"      = "not_"      -- Prelude conflict
+    fixName' "server"   = "server_"   -- servant-swagger conflict
     fixName' n = n
 
 gunfoldEnum :: String -> [a] -> (forall b r. Data b => c (b -> r) -> c r) -> (forall r. r -> c r) -> Constr -> c a

diff --git a/src/Data/Swagger/Lens.hs b/src/Data/Swagger/Lens.hs
@@ -59,7 +59,7 @@ makeFields ''ExternalDocs
 makeFields ''Encoding
 makeFields ''Example
 makeFields ''Discriminator
-makeFields ''Link
+makeLensesWith swaggerFieldRules ''Link
 
 -- * Prisms
 -- ** 'SecuritySchemeType' prisms