recursion-ninja pushed to branch wip/fix-26953 at Glasgow Haskell Compiler / GHC
Commits:
-
182e1846
by Recursion Ninja at 2026-06-26T13:45:06-04:00
5 changed files:
- compiler/GHC/Iface/Syntax.hs
- compiler/GHC/Iface/Warnings.hs
- compiler/GHC/Rename/Pat.hs
- libraries/process
- utils/check-exact/ExactPrint.hs
Changes:
| ... | ... | @@ -671,7 +671,7 @@ fromIfaceWarningTxt = \case |
| 671 | 671 | fromIfaceStringLiteralWithNames :: (IfaceStringLiteral, [IfExtName]) -> WithHsDocIdentifiers (StringLiteral GhcRn) GhcRn
|
| 672 | 672 | fromIfaceStringLiteralWithNames (str, names) = WithHsDocIdentifiers (fromIfaceStringLiteral str) (map noLoc names)
|
| 673 | 673 | |
| 674 | -fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral (GhcPass p)
|
|
| 674 | +fromIfaceStringLiteral :: IfaceStringLiteral -> StringLiteral GhcRn
|
|
| 675 | 675 | fromIfaceStringLiteral (IfStringLiteral st fs) = StringLiteral st fs
|
| 676 | 676 | |
| 677 | 677 |
| ... | ... | @@ -28,6 +28,6 @@ toIfaceWarningTxt (DeprecatedTxt src strs) = IfDeprecatedTxt src (map (toIfaceSt |
| 28 | 28 | toIfaceStringLiteralWithNames :: WithHsDocIdentifiers (StringLiteral GhcRn) GhcRn -> (IfaceStringLiteral, [IfExtName])
|
| 29 | 29 | toIfaceStringLiteralWithNames (WithHsDocIdentifiers src names) = (toIfaceStringLiteral src, map unLoc names)
|
| 30 | 30 | |
| 31 | -toIfaceStringLiteral :: StringLiteral (GhcPass p) -> IfaceStringLiteral
|
|
| 31 | +toIfaceStringLiteral :: StringLiteral GhcRn -> IfaceStringLiteral
|
|
| 32 | 32 | toIfaceStringLiteral sLit =
|
| 33 | 33 | IfStringLiteral (stringLitSourceText sLit) (sl_fs sLit) |
| ... | ... | @@ -1026,7 +1026,7 @@ getFieldIds flds = map (hsRecFieldSel . unLoc) flds |
| 1026 | 1026 | getFieldRdrs :: [LHsRecField GhcRn arg] -> [RdrName]
|
| 1027 | 1027 | getFieldRdrs flds = map (foExt . unXRec @GhcRn . hfbLHS . unLoc) flds
|
| 1028 | 1028 | |
| 1029 | -getFieldLbls :: [LHsRecField (GhcPass p) arg] -> [IdGhcP p]
|
|
| 1029 | +getFieldLbls :: [LHsRecField GhcRn arg] -> [IdGhcP p]
|
|
| 1030 | 1030 | getFieldLbls flds
|
| 1031 | 1031 | = map (unLoc . foLabel . unLoc . hfbLHS . unLoc) flds
|
| 1032 | 1032 |
| 1 | -Subproject commit 11fd247ad33208da7a914acf15d4a09d64a6a4c4 |
|
| 1 | +Subproject commit 92deb52c1781bf10ad390296dbc435abe103bfe4 |
| ... | ... | @@ -1584,7 +1584,7 @@ instance ExactPrint (LocatedP (WarningTxt GhcPs)) where |
| 1584 | 1584 | c' <- markEpToken c
|
| 1585 | 1585 | return (L (EpAnn l (AnnPragma o' c' (os',cs') l1 l2 t m) css) (DeprecatedTxt src ws'))
|
| 1586 | 1586 | |
| 1587 | -instance Typeable p => ExactPrint (InWarningCategory (GhcPass p)) where
|
|
| 1587 | +instance Typeable p => ExactPrint (InWarningCategory GhcPs) where
|
|
| 1588 | 1588 | getAnnotationEntry _ = NoEntryVal
|
| 1589 | 1589 | setAnnotationAnchor a _ _ _ = a
|
| 1590 | 1590 | |
| ... | ... | @@ -1969,7 +1969,7 @@ exactNsSpec (DataNamespaceSpecifier data_) = do |
| 1969 | 1969 | |
| 1970 | 1970 | -- ---------------------------------------------------------------------
|
| 1971 | 1971 | |
| 1972 | -instance Typeable p => ExactPrint (StringLiteral (GhcPass p)) where
|
|
| 1972 | +instance Typeable p => ExactPrint (StringLiteral GhcPs) where
|
|
| 1973 | 1973 | getAnnotationEntry = const NoEntryVal
|
| 1974 | 1974 | setAnnotationAnchor a _ _ _ = a
|
| 1975 | 1975 |