Apoorv Ingle pushed to branch wip/ani/kill-SrcCodeOrigin at Glasgow Haskell Compiler / GHC
Commits:
-
dd34f3ec
by Apoorv Ingle at 2026-03-11T17:23:53-05:00
5 changed files:
- compiler/GHC/Hs/Instances.hs
- testsuite/tests/count-deps/CountDepsAst.stdout
- testsuite/tests/count-deps/CountDepsParser.stdout
- testsuite/tests/monadfail/MonadFailErrors.stderr
- testsuite/tests/parser/should_fail/RecordDotSyntaxFail9.stderr
Changes:
| ... | ... | @@ -642,7 +642,7 @@ deriving instance Eq (IE GhcTc) |
| 642 | 642 | -- TODO: I think we still need instances for StmtCtxt, ExprCtxt and PatCtxt ctors of ErrCtxtMsg
|
| 643 | 643 | instance Data ErrCtxtMsg where
|
| 644 | 644 | gunfold _ _ _ = error "no gunfold for ErrCtxtMsg"
|
| 645 | - gfoldl _ _ _ = error "no gfoldl for ErrCtxtMsg"
|
|
| 645 | + gfoldl _ k z = k z
|
|
| 646 | 646 | toConstr = error "no toConstr for ErrCtxtMsg"
|
| 647 | 647 | dataTypeOf = error "no dataTypeOf for ErrCtxtMsg"
|
| 648 | 648 |
| ... | ... | @@ -143,7 +143,6 @@ GHC.Tc.Types.Rank |
| 143 | 143 | GHC.Tc.Types.TH
|
| 144 | 144 | GHC.Tc.Types.TcRef
|
| 145 | 145 | GHC.Tc.Utils.TcType
|
| 146 | -GHC.Tc.Zonk.Monad
|
|
| 147 | 146 | GHC.Types.Annotations
|
| 148 | 147 | GHC.Types.Arity
|
| 149 | 148 | GHC.Types.Avail
|
| ... | ... | @@ -164,7 +164,6 @@ GHC.Tc.Types.Rank |
| 164 | 164 | GHC.Tc.Types.TH
|
| 165 | 165 | GHC.Tc.Types.TcRef
|
| 166 | 166 | GHC.Tc.Utils.TcType
|
| 167 | -GHC.Tc.Zonk.Monad
|
|
| 168 | 167 | GHC.Types.Annotations
|
| 169 | 168 | GHC.Types.Arity
|
| 170 | 169 | GHC.Types.Avail
|
| 1 | - |
|
| 2 | 1 | MonadFailErrors.hs:14:5: error: [GHC-39999]
|
| 3 | 2 | • Could not deduce ‘MonadFail m’
|
| 4 | 3 | arising from a do statement
|
| ... | ... | @@ -15,10 +14,6 @@ MonadFailErrors.hs:14:5: error: [GHC-39999] |
| 15 | 14 | In the expression:
|
| 16 | 15 | do Just x <- undefined
|
| 17 | 16 | undefined
|
| 18 | - In an equation for ‘general’:
|
|
| 19 | - general
|
|
| 20 | - = do Just x <- undefined
|
|
| 21 | - undefined
|
|
| 22 | 17 | |
| 23 | 18 | MonadFailErrors.hs:28:5: error: [GHC-39999]
|
| 24 | 19 | • No instance for ‘MonadFail Identity’
|
| ... | ... | @@ -28,10 +23,6 @@ MonadFailErrors.hs:28:5: error: [GHC-39999] |
| 28 | 23 | In the expression:
|
| 29 | 24 | do Just x <- undefined
|
| 30 | 25 | undefined
|
| 31 | - In an equation for ‘identity’:
|
|
| 32 | - identity
|
|
| 33 | - = do Just x <- undefined
|
|
| 34 | - undefined
|
|
| 35 | 26 | |
| 36 | 27 | MonadFailErrors.hs:42:5: error: [GHC-39999]
|
| 37 | 28 | • No instance for ‘MonadFail ((->) r)’
|
| ... | ... | @@ -41,7 +32,4 @@ MonadFailErrors.hs:42:5: error: [GHC-39999] |
| 41 | 32 | In the expression:
|
| 42 | 33 | do Just x <- undefined
|
| 43 | 34 | undefined
|
| 44 | - In an equation for ‘reader’:
|
|
| 45 | - reader
|
|
| 46 | - = do Just x <- undefined
|
|
| 47 | - undefined |
|
| 35 | + |
| 1 | - |
|
| 2 | 1 | RecordDotSyntaxFail9.hs:7:11: error: [GHC-18872]
|
| 3 | 2 | • Couldn't match type ‘Int’ with ‘[Char]’
|
| 4 | 3 | arising from selecting the field ‘foo’
|
| 5 | - • In the expression: a.foo :: String
|
|
| 4 | + • In the expression: a.foo
|
|
| 6 | 5 | In a pattern binding: _ = a.foo :: String
|
| 7 | 6 | In a stmt of a 'do' block: let _ = a.foo :: String
|
| 7 | + |