Revert "WIP on combining Step 1 and 3 of Trees That Grow"

This reverts commit 0ff152c9e633accca48815e26e59d1af1fe44ceb.

Sadly this broke when bootstrapping with 8.0.2 due to #14396.

Reverts haddock submodule.

2 files changed, 12 insertions, 11 deletions

diff --git a/utils/ghctags/Main.hs b/utils/ghctags/Main.hs
index 6290158810..f74c7514db 100644
--- a/utils/ghctags/Main.hs
+++ b/utils/ghctags/Main.hs
@@ -291,20 +291,21 @@ boundThings modname lbinding =
               lid id = FoundThing modname (getOccString id) loc
           in case unLoc lpat of
                WildPat _ -> tl
-               VarPat _ (L _ name) -> lid name : tl
-               LazyPat _ p -> patThings p tl
-               AsPat _ id p -> patThings p (thing id : tl)
-               ParPat _ p -> patThings p tl
-               BangPat _ p -> patThings p tl
-               ListPat _ ps -> foldr patThings tl ps
-               TuplePat _ ps _  -> foldr patThings tl ps
-               PArrPat _ ps -> foldr patThings tl ps
+               VarPat (L _ name) -> lid name : tl
+               LazyPat p -> patThings p tl
+               AsPat id p -> patThings p (thing id : tl)
+               ParPat p -> patThings p tl
+               BangPat p -> patThings p tl
+               ListPat ps _ _ -> foldr patThings tl ps
+               TuplePat ps _ _ -> foldr patThings tl ps
+               PArrPat ps _ -> foldr patThings tl ps
                ConPatIn _ conargs -> conArgs conargs tl
                ConPatOut{ pat_args = conargs } -> conArgs conargs tl
-               LitPat _ _ -> tl
+               LitPat _ -> tl
                NPat {} -> tl -- form of literal pattern?
-               NPlusKPat _ id _ _ _ _ -> thing id : tl
-               SigPat _ p -> patThings p tl
+               NPlusKPat id _ _ _ _ _ -> thing id : tl
+               SigPatIn p _ -> patThings p tl
+               SigPatOut p _ -> patThings p tl
                _ -> error "boundThings"
         conArgs (PrefixCon ps) tl = foldr patThings tl ps
         conArgs (RecCon (HsRecFields { rec_flds = flds })) tl
diff --git a/utils/haddock b/utils/haddock
-Subproject 01eeeb048acd2dd05ff6471ae148a97cf072054
+Subproject 1789c77a6ed1580dc10a4391dc8c398e902f03b