diff options
Diffstat (limited to 'src/Haddock/Utils.hs')
| -rw-r--r-- | src/Haddock/Utils.hs | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/src/Haddock/Utils.hs b/src/Haddock/Utils.hs index 9a712d70..a4883078 100644 --- a/src/Haddock/Utils.hs +++ b/src/Haddock/Utils.hs @@ -21,7 +21,7 @@ module Haddock.Utils ( contentsHtmlFile, indexHtmlFile, frameIndexHtmlFile, moduleIndexFrameName, mainFrameName, synopsisFrameName, - subIndexHtmlFile, pathJoin, + subIndexHtmlFile, anchorNameStr, cssFile, iconFile, jsFile, plusFile, minusFile, framesFile, @@ -165,7 +165,7 @@ moduleHtmlFile :: Module -> FilePath moduleHtmlFile mdl = case Map.lookup mdl html_xrefs of Nothing -> mdl' ++ ".html" - Just fp0 -> pathJoin [fp0, mdl' ++ ".html"] + Just fp0 -> joinPath [fp0, mdl' ++ ".html"] where mdl' = map (\c -> if c == '.' then '-' else c) (moduleNameString (moduleName mdl)) @@ -204,16 +204,6 @@ anchorNameStr name | isValOcc name = "v:" ++ occNameString name | otherwise = "t:" ++ occNameString name -pathJoin :: [FilePath] -> FilePath -pathJoin = foldr join [] - where join :: FilePath -> FilePath -> FilePath - join path1 "" = path1 - join "" path2 = path2 - join path1 path2 - | isPathSeparator (last path1) = path1++path2 - | otherwise = path1++pathSeparator:path2 - - -- ----------------------------------------------------------------------------- -- Files we need to copy from our $libdir |