diff options
| author | Hécate Moonlight <Kleidukos@users.noreply.github.com> | 2021-01-14 16:04:20 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-14 16:04:20 +0100 |
| commit | 911357bcd3eb2f1f03ba06831e07d45595b3a458 (patch) | |
| tree | 4a36815315d0b97dd670811073e7dfe64529d99e | |
| parent | e7c225587eb59941adb1c46e3888245ae99281b4 (diff) | |
| parent | 600e076140649cb392d063ad73eb015630f62ff1 (diff) | |
Merge pull request #1273 from hsyl20/wip/hsyl20/arrows
Fix after binder collect changes
| -rw-r--r-- | haddock-api/src/Haddock/GhcUtils.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Interface/Create.hs | 2 | ||||
| -rw-r--r-- | haddock-api/src/Haddock/Types.hs | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index 0a0211c9..b7e2cafa 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -164,7 +164,7 @@ getGADTConType (ConDeclH98 {}) = panic "getGADTConType" getMainDeclBinderI :: HsDecl DocNameI -> [IdP DocNameI] getMainDeclBinderI (TyClD _ d) = [tcdNameI d] getMainDeclBinderI (ValD _ d) = - case collectHsBindBinders d of + case collectHsBindBinders CollNoDictBinders d of [] -> [] (name:_) -> [name] getMainDeclBinderI (SigD _ d) = sigNameNoLoc d diff --git a/haddock-api/src/Haddock/Interface/Create.hs b/haddock-api/src/Haddock/Interface/Create.hs index 30fb8b7e..76f1f765 100644 --- a/haddock-api/src/Haddock/Interface/Create.hs +++ b/haddock-api/src/Haddock/Interface/Create.hs @@ -956,7 +956,7 @@ fullModuleContents is_sig modMap pkgName thisMod semMod warnings gre exportedNam doc <- liftErrMsg (processDocStringParas dflags pkgName gre docStr) return [[ExportDoc doc]] (L _ (ValD _ valDecl)) - | name:_ <- collectHsBindBinders valDecl + | name:_ <- collectHsBindBinders CollNoDictBinders valDecl , Just (L _ SigD{}:_) <- filter isSigD <$> M.lookup name declMap -> return [] _ -> diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs index 32f14f74..bb76a1e9 100644 --- a/haddock-api/src/Haddock/Types.hs +++ b/haddock-api/src/Haddock/Types.hs @@ -307,7 +307,7 @@ data DocNameI type instance IdP DocNameI = DocName instance CollectPass DocNameI where - collectXXPat _ ext = noExtCon ext + collectXXPat _ _ ext = noExtCon ext instance NamedThing DocName where getName (Documented name _) = name |