From 4f8a875dec5db8795286a557779f3eb684718be6 Mon Sep 17 00:00:00 2001
From: Alan Zimmerman <alan.zimm@gmail.com>
Date: Wed, 6 Jul 2022 21:40:21 +0100
Subject: [PATCH] Match GHC changes for T21805
This brings in a newtype for FieldLabelString
---
haddock-api/src/Haddock/Convert.hs | 4 +++-
1 file changed, 3 insertions(+), 1 deletion(-)
diff --git a/haddock-api/src/Haddock/Convert.hs b/haddock-api/src/Haddock/Convert.hs
index f8b4185130..f7ab7fd75c 100644
--- a/haddock-api/src/Haddock/Convert.hs
+++ b/haddock-api/src/Haddock/Convert.hs
@@ -52,6 +52,8 @@ import GHC.Types.Var
import GHC.Types.Var.Set
import GHC.Types.SrcLoc
+import Language.Haskell.Syntax.Basic (FieldLabelString(..))
+
import Haddock.Types
import Haddock.Interface.Specialize
import Haddock.GhcUtils ( orderedFVs, defaultRuntimeRepVars, mkEmptySigType )
@@ -387,7 +389,7 @@ synifyDataCon use_gadt_syntax dc =
field_tys = zipWith con_decl_field (dataConFieldLabels dc) linear_tys
con_decl_field fl synTy = noLocA $
- ConDeclField noAnn [noLocA $ FieldOcc (flSelector fl) (noLocA $ mkVarUnqual $ flLabel fl)] synTy
+ ConDeclField noAnn [noLocA $ FieldOcc (flSelector fl) (noLocA $ mkVarUnqual $ field_label $ flLabel fl)] synTy
Nothing
mk_h98_arg_tys :: Either ErrMsg (HsConDeclH98Details GhcRn)
--
GitLab