[Git][ghc/ghc][master] Error Messages: Properly align cyclic module error

[Marge Bot (@marge-bot)]

Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC


Commits:
2e36f5d2 by Jade at 2024-02-24T16:02:51-05:00
Error Messages: Properly align cyclic module error

Fixes: #24476

- - - - -


3 changed files:

- compiler/GHC/Driver/Make.hs
- testsuite/tests/driver/T24196/T24196.stderr
- testsuite/tests/driver/T24275/T24275.stderr


Changes:

=====================================
compiler/GHC/Driver/Make.hs
=====================================
@@ -2404,7 +2404,7 @@ cyclicModuleErr mss
     show_path :: [ModuleGraphNode] -> SDoc
     show_path []  = panic "show_path"
     show_path [m] = ppr_node m <+> text "imports itself"
-    show_path (m1:m2:ms) = vcat ( nest 6 (ppr_node m1)
+    show_path (m1:m2:ms) = vcat ( nest 14 (ppr_node m1)
                                 : nest 6 (text "imports" <+> ppr_node m2)
                                 : go ms )
        where


=====================================
testsuite/tests/driver/T24196/T24196.stderr
=====================================
@@ -1,4 +1,4 @@
 Module graph contains a cycle:
-        module ‘T24196A’ (./T24196A.hs-boot)
+                module ‘T24196A’ (./T24196A.hs-boot)
         imports module ‘T24196B’ (T24196B.hs)
   which imports module ‘T24196A’ (./T24196A.hs-boot)


=====================================
testsuite/tests/driver/T24275/T24275.stderr
=====================================
@@ -1,4 +1,4 @@
 Module graph contains a cycle:
-        module ‘T24275A’ (./T24275A.hs-boot)
+                module ‘T24275A’ (./T24275A.hs-boot)
         imports module ‘T24275B’ (T24275B.hs)
   which imports module ‘T24275A’ (./T24275A.hs-boot)



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2e36f5d2b875ecefa1d3709bc8ce9ef5a560a8be

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/2e36f5d2b875ecefa1d3709bc8ce9ef5a560a8be
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/20240224/f360eb2d/attachment-0001.html>