From 809f9b81a43b9115a2e62de8d660e330ce580877 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Mois=C3=A9s=20Ackerman?= <m@akr.mn>
Date: Mon, 12 Jun 2023 15:39:39 +0200
Subject: [PATCH] Construct catch-all default case using helpers
GHC.Rename.Utils concrete helpers instead of wrapGenSpan + HS AST constructors
(cherry picked from commit dd782343f131cfd983a7fb2431d9d4a9ae497551)
---
compiler/GHC/Tc/TyCl/Utils.hs | 11 +++++------
1 file changed, 5 insertions(+), 6 deletions(-)
diff --git a/compiler/GHC/Tc/TyCl/Utils.hs b/compiler/GHC/Tc/TyCl/Utils.hs
index 0ca024fefd3..dab5f3f77a0 100644
--- a/compiler/GHC/Tc/TyCl/Utils.hs
+++ b/compiler/GHC/Tc/TyCl/Utils.hs
@@ -64,7 +64,7 @@ import GHC.Data.FastString
import GHC.Unit.Module
-import GHC.Rename.Utils (wrapGenSpan)
+import GHC.Rename.Utils (genHsVar, genLHsApp, genLHsLit, genWildPat)
import GHC.Types.Basic
import GHC.Types.FieldLabel
@@ -956,11 +956,10 @@ mkOneRecordSelector all_cons idDetails fl has_sel
-- mentions this particular record selector
deflt | all dealt_with all_cons = []
| otherwise = [mkSimpleMatch CaseAlt
- [wrapGenSpan (WildPat noExtField)]
- (wrapGenSpan
- (HsApp noComments
- (wrapGenSpan (HsVar noExtField (wrapGenSpan (getName rEC_SEL_ERROR_ID))))
- (wrapGenSpan (HsLit noComments msg_lit))))]
+ [genWildPat]
+ (genLHsApp
+ (genHsVar (getName rEC_SEL_ERROR_ID))
+ (genLHsLit msg_lit))]
-- Do not add a default case unless there are unmatched
-- constructors. We must take account of GADTs, else we
--
GitLab