[Git][ghc/ghc][master] Remove duplicate Anno instances

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
1d66c9e3 by Jan Hrček at 2024-06-18T18:51:47-04:00
Remove duplicate Anno instances

- - - - -


3 changed files:

- compiler/GHC/Hs.hs
- compiler/GHC/Hs/Decls.hs
- compiler/GHC/Hs/Expr.hs


Changes:

=====================================
compiler/GHC/Hs.hs
=====================================
@@ -94,8 +94,6 @@ type instance XCModule GhcRn = DataConCantHappen
 type instance XCModule GhcTc = DataConCantHappen
 type instance XXModule p = DataConCantHappen
 
-type instance Anno ModuleName = SrcSpanAnnA
-
 deriving instance Data (HsModule GhcPs)
 
 data AnnsModule


=====================================
compiler/GHC/Hs/Decls.hs
=====================================
@@ -810,8 +810,6 @@ ppr_con_names = pprWithCommas (pprPrefixOcc . unLoc)
 type instance XCFamEqn    (GhcPass _) r = [AddEpAnn]
 type instance XXFamEqn    (GhcPass _) r = DataConCantHappen
 
-type instance Anno (FamEqn (GhcPass p) _) = SrcSpanAnnA
-
 ----------------- Class instances -------------
 
 type instance XCClsInstDecl    GhcPs = ( Maybe (LWarningTxt GhcPs)
@@ -1025,8 +1023,6 @@ derivDeprecation = fmap unLoc . decl_deprecation (ghcPass @p)
       = depr
     decl_deprecation _ _ = Nothing
 
-type instance Anno OverlapMode = SrcSpanAnnP
-
 instance OutputableBndrId p
        => Outputable (DerivDecl (GhcPass p)) where
     ppr (deriv at DerivDecl { deriv_type = ty
@@ -1342,8 +1338,6 @@ type instance XCRoleAnnotDecl GhcTc = NoExtField
 
 type instance XXRoleAnnotDecl (GhcPass _) = DataConCantHappen
 
-type instance Anno (Maybe Role) = EpAnnCO
-
 instance OutputableBndr (IdP (GhcPass p))
        => Outputable (RoleAnnotDecl (GhcPass p)) where
   ppr (RoleAnnotDecl _ ltycon roles)


=====================================
compiler/GHC/Hs/Expr.hs
=====================================
@@ -1279,9 +1279,6 @@ type instance XXCmd       GhcPs = DataConCantHappen
 type instance XXCmd       GhcRn = DataConCantHappen
 type instance XXCmd       GhcTc = HsWrap HsCmd
 
-type instance Anno [LocatedA (StmtLR (GhcPass pl) (GhcPass pr) (LocatedA (HsCmd (GhcPass pr))))]
-  = SrcSpanAnnL
-
     -- If   cmd :: arg1 --> res
     --      wrap :: arg1 "->" arg2
     -- Then (XCmd (HsWrap wrap cmd)) :: arg2 --> res



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1d66c9e3dd3bd92da97be7ebc7bb06eb3d406289

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/1d66c9e3dd3bd92da97be7ebc7bb06eb3d406289
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20240618/ea3cd80e/attachment-0001.html>