[Git][ghc/ghc][wip/T23536-teo] Apply 4 suggestion(s) to 3 file(s)

[Teo Camarasu (@teo)]

Teo Camarasu pushed to branch wip/T23536-teo at Glasgow Haskell Compiler / GHC


Commits:
182f88fa by Sebastian Graf at 2024-04-11T11:33:28+00:00
Apply 4 suggestion(s) to 3 file(s)
- - - - -


3 changed files:

- compiler/GHC/Tc/Gen/Splice.hs
- compiler/ghc.cabal.in
- hadrian/src/Settings/Default.hs


Changes:

=====================================
compiler/GHC/Tc/Gen/Splice.hs
=====================================
@@ -2952,7 +2952,7 @@ tcGetInterp = do
 --
 --  A. The vendoring in (2) means that the fully qualified name of the in-tree TH
 --     AST will be, e.g., `template-haskell-next:...VarE`, not `template-haskell:...VarE`.
---     That is OK, because we need it just for the `Binary` instance, which does
+--     That is OK, because we need it just for the `Binary` instance and to convert TH ASTs returned by splices into the Hs AST, both of which do
 --     not depend on the fully qualified name of the type to serialise!
 --     Importantly, Note [Hard-wiring in-tree template-haskell for desugaring quotes]
 --     is unaffected, because the desugaring refers to names in stage1 TH, i.e.,


=====================================
compiler/ghc.cabal.in
=====================================
@@ -85,8 +85,7 @@ Flag hadrian-stage0
 Flag bootstrap-th
         Description:
           Enabled when building the stage1 compiler in order to vendor the in-tree
-          `template-haskell` library, while allowing dependencies to depend on the
-          boot `template-haskell` library.
+          `template-haskell` library as `template-haskell-next`.
           See Note [Bootstrapping Template Haskell]
         Default: False
         Manual: True
@@ -135,7 +134,7 @@ Library
 
     if flag(bootstrap-th)
       Build-Depends:
-        template-haskell-next == 2.22.0.0
+        template-haskell-next == *
     else
       Build-Depends:
         template-haskell      == 2.22.0.0


=====================================
hadrian/src/Settings/Default.hs
=====================================
@@ -108,8 +108,8 @@ stage0Packages = do
              , parsec
              , semaphoreCompat
              , time
-             , text
              , templateHaskellNext
+             , text
              , transformers
              , unlit
              , hp2ps



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/182f88faa8502da3d4805f1a60e918875458ed79

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/182f88faa8502da3d4805f1a60e918875458ed79
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/20240411/b0e1eb02/attachment-0001.html>