diff options
| author | Yuchen Pei <hi@ypei.me> | 2022-07-21 12:27:19 +1000 |
|---|---|---|
| committer | Yuchen Pei <hi@ypei.me> | 2022-07-21 12:27:19 +1000 |
| commit | 32ac0f03b4259fc8eebba9bb3a2a46d23122a43b (patch) | |
| tree | a371fb9c5a3f78e6f53c66d70e1255fdc71bba4d /haddock-library | |
| parent | cd17128898089450bb21790fd1864dc08fd4ddbc (diff) | |
| parent | 2368e9329e6600b46000abd24ec00b7e27bcae75 (diff) | |
Merge remote-tracking branch 'upstream/ghc-9.4' into ghc-9.4
Diffstat (limited to 'haddock-library')
4 files changed, 3 insertions, 5 deletions
diff --git a/haddock-library/fixtures/Fixtures.hs b/haddock-library/fixtures/Fixtures.hs index 101bce65..374a664c 100644 --- a/haddock-library/fixtures/Fixtures.hs +++ b/haddock-library/fixtures/Fixtures.hs @@ -9,8 +9,7 @@ import Data.Foldable (traverse_) import Data.List (foldl') import Data.Traversable (for) import GHC.Generics (Generic) -import Prelude () -import Prelude.Compat +import Prelude import System.Directory (getDirectoryContents) import System.Exit (exitFailure) import System.FilePath diff --git a/haddock-library/haddock-library.cabal b/haddock-library/haddock-library.cabal index 9a868725..261cbb1f 100644 --- a/haddock-library/haddock-library.cabal +++ b/haddock-library/haddock-library.cabal @@ -86,7 +86,6 @@ test-suite spec Documentation.Haddock.Parser.Identifier build-depends: - , base-compat ^>= 0.12.0 , QuickCheck ^>= 2.11 || ^>= 2.13.2 || ^>= 2.14 , deepseq ^>= 1.3.0.0 || ^>= 1.4.0.0 @@ -113,7 +112,6 @@ test-suite fixtures , base -- extra dependencies - , base-compat ^>= 0.12.0 , directory ^>= 1.3.0.2 , filepath ^>= 1.4.1.2 , optparse-applicative ^>= 0.15 diff --git a/haddock-library/src/Documentation/Haddock/Parser/Monad.hs b/haddock-library/src/Documentation/Haddock/Parser/Monad.hs index 582a0776..8d6e7a1d 100644 --- a/haddock-library/src/Documentation/Haddock/Parser/Monad.hs +++ b/haddock-library/src/Documentation/Haddock/Parser/Monad.hs @@ -1,6 +1,7 @@ {-# LANGUAGE FlexibleContexts #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE TypeFamilies #-} +{-# LANGUAGE TypeOperators #-} {-# LANGUAGE BangPatterns #-} -- | -- Module : Documentation.Haddock.Parser.Monad diff --git a/haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs b/haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs index 2bb58fdf..716e1adc 100644 --- a/haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs +++ b/haddock-library/test/Documentation/Haddock/Parser/UtilSpec.hs @@ -4,7 +4,7 @@ module Documentation.Haddock.Parser.UtilSpec (main, spec) where import Documentation.Haddock.Parser.Monad import Documentation.Haddock.Parser.Util -import Data.Either.Compat (isLeft) +import Data.Either (isLeft) import Test.Hspec #if !(MIN_VERSION_base(4,8,0)) import Control.Applicative |