haskell-docs 4.2.4 → 4.2.5

raw patch · 2 files changed

+9/−9 lines, 2 filesPVP: major bump suggested

API removals or changes: PVP suggests a major version bump

API changes (from Hackage documentation)

Files

• haskell-docs.cabal +1/−1
• src/Haskell/Docs/Haddock.hs +8/−8

@@ -1,5 +1,5 @@ name:                haskell-docs-version:             4.2.4+version:             4.2.5 synopsis:            A program to find and display the docs and type of a name description:         Given a module name and a name, or just a name, it will find and display                      the documentation of that name.

@@ -38,7 +38,7 @@   -> Identifier   -> Ghc (Either DocsException [IdentDoc]) searchIdent gs mprevious name =-  do packages <- fmap (filterPrevious mprevious) (getAllPackages gs)+  do packages <- fmap (excludePrevious mprevious) (getAllPackages gs)      searchInPackages packages                       Nothing                       name@@ -50,7 +50,7 @@   -> Identifier   -> Ghc (Either DocsException [IdentDoc]) searchModuleIdent mprevious mname name =-  do result <- fmap (filterPrevious mprevious) (getPackagesByModule mname)+  do result <- fmap (excludePrevious mprevious) (getPackagesByModule mname)      case result of        [] ->          return (Left NoFindModule)@@ -69,7 +69,7 @@   -> Identifier   -> Ghc (Either DocsException [IdentDoc]) searchPackageModuleIdent mprevious pname mname name =-  do result <- fmap (filterPrevious mprevious) (getPackagesByModule mname)+  do result <- fmap (excludePrevious mprevious) (getPackagesByModule mname)      case result of        [] -> return (Left NoFindModule)        packages ->@@ -79,7 +79,7 @@            Just package ->              searchWithPackage package (Just mname) name -filterPrevious exclude =+excludePrevious exclude =   filter (maybe (const True)                 (on (/=) sourcePackageId)                 exclude)@@ -126,13 +126,13 @@   -> InstalledInterface   -> Ghc (Either DocsException [IdentDoc]) searchWithInterface package name interface =-  case find ((==name) . Identifier . getOccString) (instExports interface) of+  case find ((==name) . Identifier . getOccString) (instExports interface) of -- See if the module exports the Identifier     Nothing ->       return (Left NoFindNameInExports)     Just{} ->-      case M.lookup (unIdentifier name) (interfaceNameMap interface) of+      case M.lookup (unIdentifier name) (interfaceNameMap interface) of       -- See if it is defined in the module itself         Nothing ->-          case lookup (unIdentifier name) (map (getOccString &&& id) (instExports interface)) of+          case lookup (unIdentifier name) (map (getOccString &&& id) (instExports interface)) of -- See if it is re-exported             Just subname               | moduleName (nameModule subname) /= moduleName (instMod interface) ->                 descendSearch package name subname@@ -187,4 +187,4 @@ -- restart our search process. descendSearch :: PackageConfig -> Identifier -> Name -> Ghc (Either DocsException [IdentDoc]) descendSearch package name qname = do-  searchModuleIdent (Just package) (moduleName (nameModule qname)) name+  searchModuleIdent Nothing (moduleName (nameModule qname)) name