[Git][ghc/ghc][wip/expand-do] accepting new test output

[Apoorv Ingle (@ani)]

Apoorv Ingle pushed to branch wip/expand-do at Glasgow Haskell Compiler / GHC


Commits:
074e777f by Apoorv Ingle at 2023-07-25T09:12:57-05:00
accepting new test output

- - - - -


3 changed files:

- compiler/GHC/Tc/Gen/App.hs
- testsuite/tests/rebindable/rebindable6.stderr
- testsuite/tests/typecheck/should_run/Typeable1.stderr


Changes:

=====================================
compiler/GHC/Tc/Gen/App.hs
=====================================
@@ -373,10 +373,6 @@ tcApp rn_expr exp_res_ty
                  = do traceTc "tcApp" (vcat [text "VAExpansionStmt", ppr stmt, ppr loc, ppr rn_fun, ppr fun_ctxt])
                       setSrcSpan loc $ addStmtCtxt (text "tcApp VAExpansionStmt") stmt
                         thing_inside
-                 -- | XExpr (ExpandedStmt (HsExpanded stmt@(L loc _) _)) <- rn_fun
-                 -- = do traceTc "tcApp" (vcat [text "RnFun stmt", ppr stmt, ppr loc, ppr rn_fun, ppr fun_ctxt])
-                 --      setSrcSpanA loc $ -- addStmtCtxt (text "tcApp VAExpansion stmt") stmt
-                 --        thing_inside
                  | insideExpansion fun_ctxt
                  = do traceTc "tcApp" (vcat [text "insideExpansion", ppr rn_fun, ppr fun_ctxt])
                       addHeadCtxt fun_ctxt thing_inside


=====================================
testsuite/tests/rebindable/rebindable6.stderr
=====================================
@@ -25,15 +25,15 @@ rebindable6.hs:110:17: error: [GHC-39999]
                  return b
 
 rebindable6.hs:111:17: error: [GHC-39999]
-    • Ambiguous type variables ‘p0’, ‘t0’ arising from a do statement
+    • Ambiguous type variables ‘t1’, ‘t0’ arising from a do statement
       prevents the constraint ‘(HasBind
-                                  (IO (Maybe b) -> (Maybe b -> p0) -> t0))’ from being solved.
+                                  (IO (Maybe b) -> (Maybe b -> t1) -> t0))’ from being solved.
         (maybe you haven't applied a function to enough arguments?)
       Relevant bindings include
         g :: IO (Maybe b) (bound at rebindable6.hs:108:19)
         test_do :: IO a -> IO (Maybe b) -> IO b
           (bound at rebindable6.hs:108:9)
-      Probable fix: use a type annotation to specify what ‘p0’,
+      Probable fix: use a type annotation to specify what ‘t1’,
                                                           ‘t0’ should be.
       Potentially matching instance:
         instance HasBind (IO a -> (a -> IO b) -> IO b)
@@ -50,15 +50,15 @@ rebindable6.hs:111:17: error: [GHC-39999]
                  return b
 
 rebindable6.hs:112:17: error: [GHC-39999]
-    • Ambiguous type variable ‘p0’ arising from a use of ‘return’
-      prevents the constraint ‘(HasReturn (b -> p0))’ from being solved.
+    • Ambiguous type variable ‘t1’ arising from a use of ‘return’
+      prevents the constraint ‘(HasReturn (b -> t1))’ from being solved.
         (maybe you haven't applied a function to enough arguments?)
       Relevant bindings include
         b :: b (bound at rebindable6.hs:111:23)
         g :: IO (Maybe b) (bound at rebindable6.hs:108:19)
         test_do :: IO a -> IO (Maybe b) -> IO b
           (bound at rebindable6.hs:108:9)
-      Probable fix: use a type annotation to specify what ‘p0’ should be.
+      Probable fix: use a type annotation to specify what ‘t1’ should be.
       Potentially matching instance:
         instance HasReturn (a -> IO a) -- Defined at rebindable6.hs:46:18
     • In a stmt of a 'do' block: return b


=====================================
testsuite/tests/typecheck/should_run/Typeable1.stderr
=====================================
@@ -23,9 +23,3 @@ Typeable1.hs:22:5: error: [GHC-40564] [-Winaccessible-code (in -Wdefault), Werro
     • Relevant bindings include
         y :: TypeRep b2 (bound at Typeable1.hs:19:11)
         x :: TypeRep a2 (bound at Typeable1.hs:19:9)
-
-Typeable1.hs:22:5: error: [GHC-94210] [-Woverlapping-patterns (in -Wdefault), Werror=overlapping-patterns]
-    Pattern match has inaccessible right hand side
-    In a pattern binding in
-         a 'do' block:
-        App x y <- ...



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/074e777f3ca82a0e8506c66036778f6a8608ff05

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/074e777f3ca82a0e8506c66036778f6a8608ff05
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/20230725/1ee33e1f/attachment-0001.html>