diff options
| author | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-07-19 17:11:01 +0100 |
|---|---|---|
| committer | Edward Z. Yang <ezyang@cs.stanford.edu> | 2014-07-21 08:14:19 -0700 |
| commit | 8ac42d3327473939c013551750425cac191ff0fd (patch) | |
| tree | 2bae383f059f5d22194307fa83b7717a7983dbe6 /src/Haddock/Backends/Xhtml | |
| parent | cb96b4f1ed0462b4a394b9fda6612c3bea9886bd (diff) | |
Track GHC PackageId to PackageKey renaming.
Signed-off-by: Edward Z. Yang <ezyang@cs.stanford.edu>
Conflicts:
src/Haddock/Interface/Create.hs
Diffstat (limited to 'src/Haddock/Backends/Xhtml')
| -rw-r--r-- | src/Haddock/Backends/Xhtml/Layout.hs | 2 | ||||
| -rw-r--r-- | src/Haddock/Backends/Xhtml/Types.hs | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/src/Haddock/Backends/Xhtml/Layout.hs b/src/Haddock/Backends/Xhtml/Layout.hs index e84a57b3..253854c8 100644 --- a/src/Haddock/Backends/Xhtml/Layout.hs +++ b/src/Haddock/Backends/Xhtml/Layout.hs @@ -224,7 +224,7 @@ topDeclElem ((_,_,sourceMap,lineMap), (_,_,maybe_wiki_url)) loc splice names htm -- TODO: do something about type instances. They will point to -- the module defining the type family, which is wrong. origMod = nameModule n - origPkg = modulePackageId origMod + origPkg = modulePackageKey origMod -- Name must be documented, otherwise we wouldn't get here Documented n mdl = head names diff --git a/src/Haddock/Backends/Xhtml/Types.hs b/src/Haddock/Backends/Xhtml/Types.hs index 122861c3..3d1db887 100644 --- a/src/Haddock/Backends/Xhtml/Types.hs +++ b/src/Haddock/Backends/Xhtml/Types.hs @@ -23,7 +23,7 @@ import GHC -- the base, module and entity URLs for the source code and wiki links. -type SourceURLs = (Maybe FilePath, Maybe FilePath, Map PackageId FilePath, Map PackageId FilePath) +type SourceURLs = (Maybe FilePath, Maybe FilePath, Map PackageKey FilePath, Map PackageKey FilePath) type WikiURLs = (Maybe FilePath, Maybe FilePath, Maybe FilePath) |