diff options
author | Ben Gamari <ben@smart-cactus.org> | 2021-02-04 21:49:05 -0500 |
---|---|---|
committer | Ben Gamari <ben@smart-cactus.org> | 2021-02-06 11:53:31 -0500 |
commit | bf8ba2525e95319bdbcfc81d06448b646eba3a57 (patch) | |
tree | 83aac2bf137fccb8ae49916da9265b7b7fd41833 /haddock-api/src/Haddock/GhcUtils.hs | |
parent | e1230ede3d1c77a6916e318aefcd47829e56035c (diff) | |
parent | 1bdbf284b4ba20ee1738b13c4e3414384955f6f3 (diff) |
Merge remote-tracking branch 'origin/ghc-head' into wip/ghc-head-merge
Diffstat (limited to 'haddock-api/src/Haddock/GhcUtils.hs')
-rw-r--r-- | haddock-api/src/Haddock/GhcUtils.hs | 11 |
1 files changed, 1 insertions, 10 deletions
diff --git a/haddock-api/src/Haddock/GhcUtils.hs b/haddock-api/src/Haddock/GhcUtils.hs index 34297a0a..546e2941 100644 --- a/haddock-api/src/Haddock/GhcUtils.hs +++ b/haddock-api/src/Haddock/GhcUtils.hs @@ -35,7 +35,6 @@ import GHC.Driver.Ppr (showPpr ) import GHC.Types.Name import GHC.Unit.Module import GHC -import GHC.Core.Class import GHC.Driver.Session import GHC.Types.Basic import GHC.Types.SrcLoc ( advanceSrcLoc ) @@ -190,7 +189,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 @@ -526,14 +525,6 @@ modifySessionDynFlags f = do return () --- Extract the minimal complete definition of a Name, if one exists -minimalDef :: GhcMonad m => Name -> m (Maybe ClassMinimalDef) -minimalDef n = do - mty <- lookupGlobalName n - case mty of - Just (ATyCon (tyConClass_maybe -> Just c)) -> return . Just $ classMinimalDef c - _ -> return Nothing - ------------------------------------------------------------------------------- -- * DynFlags ------------------------------------------------------------------------------- |