diff options
| author | Ben Gamari <ben@smart-cactus.org> | 2022-08-06 13:58:27 -0400 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-08-06 13:58:27 -0400 |
| commit | e8fe591fecf626fe4540ed666d147c61728c890f (patch) | |
| tree | 5a1a1d4d63c6315539a3606cc223b941f4c8620a /haddock-test | |
| parent | 2f1711b301fea88eb1d0b40d1c04b2f0539fd882 (diff) | |
| parent | 7f2892b571c7b072c86edbf21b7c7469e21f6303 (diff) | |
Merge pull request #1518 from bgamari/wip/ghc-9.4-merge
Merge GHC 9.4 into `main`
Diffstat (limited to 'haddock-test')
| -rw-r--r-- | haddock-test/haddock-test.cabal | 6 | ||||
| -rw-r--r-- | haddock-test/src/Test/Haddock/Xhtml.hs | 3 |
2 files changed, 5 insertions, 4 deletions
diff --git a/haddock-test/haddock-test.cabal b/haddock-test/haddock-test.cabal index df6c4474..4e3bfd29 100644 --- a/haddock-test/haddock-test.cabal +++ b/haddock-test/haddock-test.cabal @@ -1,8 +1,8 @@ -cabal-version: >= 1.10 +cabal-version: 3.0 name: haddock-test version: 0.0.1 synopsis: Test utilities for Haddock -license: BSD2 +license: BSD-2-Clause author: Simon Marlow, David Waern maintainer: Simon Hengel <sol@typeful.net>, Mateusz Kowalczyk <fuuzetsu@fuuzetsu.co.uk> homepage: http://www.haskell.org/haddock/ @@ -10,7 +10,7 @@ bug-reports: https://github.com/haskell/haddock/issues copyright: (c) Simon Marlow, David Waern category: Documentation build-type: Simple -tested-with: GHC==9.0.* +tested-with: GHC==9.4.* stability: experimental library diff --git a/haddock-test/src/Test/Haddock/Xhtml.hs b/haddock-test/src/Test/Haddock/Xhtml.hs index bca2c4cc..74d8c4f7 100644 --- a/haddock-test/src/Test/Haddock/Xhtml.hs +++ b/haddock-test/src/Test/Haddock/Xhtml.hs @@ -23,8 +23,9 @@ import Data.Char ( isSpace ) newtype Xml = Xml { unXml :: String } -- | Part of parsing involves dropping the @DOCTYPE@ line +-- and windows newline endings parseXml :: String -> Maybe Xml -parseXml = Just . Xml . dropDocTypeLine +parseXml = Just . Xml . filter (/= '\r') . dropDocTypeLine where dropDocTypeLine bs | "<!DOCTYPE" `isPrefixOf` bs |