[Git][ghc/ghc][wip/T25647] 2 commits: fix

[Patrick (@soulomoon)]

Patrick pushed to branch wip/T25647 at Glasgow Haskell Compiler / GHC


Commits:
23607f3e by Patrick at 2025-02-09T02:41:31+08:00
fix

- - - - -
bfdbaffc by Patrick at 2025-02-09T02:41:49+08:00
Revert "remove wildcard usage"

This reverts commit ccc9152f23177ab7a542852ffedf626edcdcef95.

- - - - -


2 changed files:

- compiler/GHC/Tc/Gen/HsType.hs
- compiler/GHC/Types/Error.hs


Changes:

=====================================
compiler/GHC/Tc/Gen/HsType.hs
=====================================
@@ -2402,7 +2402,8 @@ kcCheckDeclHeader_cusk name flav
              -- skolemise and then quantify over.  We do not include spec_req_tvs
              -- because they are /already/ skolems
 
-       ; inferred <- quantifyTyVars skol_info $ candidates `delCandidates` spec_req_tkvs
+       ; inferred <- quantifyTyVars skol_info DefaultNonStandardTyVars $
+                     candidates `delCandidates` spec_req_tkvs
                      -- NB: 'inferred' comes back sorted in dependency order
 
        ; (scoped_kvs, tc_bndrs, res_kind) <- liftZonkM $


=====================================
compiler/GHC/Types/Error.hs
=====================================
@@ -298,8 +298,8 @@ data UnknownDiagnostic opts hint where
 type UnknownDiagnosticFor a = UnknownDiagnostic (DiagnosticOpts a) (DiagnosticHint a)
 
 instance (HasDefaultDiagnosticOpts opts, Outputable hint) => Diagnostic (UnknownDiagnostic opts hint) where
-  type DiagnosticOpts (UnknownDiagnostic opts hint) = opts
-  type DiagnosticHint (UnknownDiagnostic opts hint) = hint
+  type DiagnosticOpts (UnknownDiagnostic opts _) = opts
+  type DiagnosticHint (UnknownDiagnostic _ hint) = hint
   diagnosticMessage opts (UnknownDiagnostic f _ diag) = diagnosticMessage (f opts) diag
   diagnosticReason       (UnknownDiagnostic _ _ diag) = diagnosticReason diag
   diagnosticHints        (UnknownDiagnostic _ f diag) = map f (diagnosticHints diag)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/cb24202e1123e81baf8aa1895dcf025ee3f63e93...bfdbaffc3bdab06e453c4e067e6deeb89bdd28ad

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/compare/cb24202e1123e81baf8aa1895dcf025ee3f63e93...bfdbaffc3bdab06e453c4e067e6deeb89bdd28ad
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/20250208/25318561/attachment-0001.html>