Merge branch 'ghc-7.6' into ghc-7.6-merge-2

Conflicts:
	haddock.cabal
	src/Haddock/Interface/AttachInstances.hs
	src/Haddock/Interface/Create.hs
	src/Haddock/Interface/LexParseRn.hs
	src/Haddock/InterfaceFile.hs
	src/Haddock/Types.hs

Only GHC HEAD can compile this. GHC 7.6.x cannot compile this.

Some test fail.

1 files changed, 0 insertions, 36 deletions

diff --git a/tests/html-tests/accept.hs b/tests/html-tests/accept.hs
deleted file mode 100644
index 49da5c5a..00000000
--- a/tests/html-tests/accept.hs
+++ /dev/null
@@ -1,36 +0,0 @@
-import System.Cmd
-import System.Environment
-import System.FilePath
-import System.Exit
-import System.Directory
-import Data.List
-import Control.Monad
-
-
-main = do
-  args <- getArgs
-  dir <- getCurrentDirectory
-  contents <- getDirectoryContents (dir </> "output")
-  if not $ null args
-    then
-      mapM_ copy [ "output" </> file  | file <- contents, ".html" `isSuffixOf` file, takeBaseName file `elem` args  ]
-    else
-      mapM_ copy [ "output" </> file | file <- contents, ".html" `isSuffixOf` file ]
-
-
-copy file = do
-  let new = "tests" </> takeFileName file <.> ".ref"
-  print file
-  print new
-  contents <- readFile file
-  writeFile new (stripLinks contents)
-
-
-stripLinks str =
-  let prefix = "<a href=\"" in
-  case stripPrefix prefix str of
-    Just str' -> prefix ++ stripLinks (dropWhile (/= '"') str')
-    Nothing ->
-      case str of
-        [] -> []
-        x : xs -> x : stripLinks xs