diff options
author | Albert Krewinkel <albert@zeitkraut.de> | 2020-03-15 17:45:44 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-15 09:45:44 -0700 |
commit | a5fa55969f1b4afc0ca3e38be50b69c65d43a460 (patch) | |
tree | 2c869ee3efc4012c0df9bb8e156224eae5b3f94e /src/Text/Pandoc/Lua/Marshaling | |
parent | 76705dfeb0fc909cfc1e626df9c811beb6d18634 (diff) | |
download | pandoc-a5fa55969f1b4afc0ca3e38be50b69c65d43a460.tar.gz |
Use implicit Prelude (#6187)
* Use implicit Prelude
The previous behavior was introduced as a fix for #4464. It seems that
this change alone did not fix the issue, and `stack ghci` and `cabal
repl` only work with GHC 8.4.1 or newer, as no custom Prelude is loaded
for these versions. Given this, it seems cleaner to revert to the
implicit Prelude.
* PandocMonad: remove outdated check for base version
Only base versions 4.9 and later are supported, the check for
`MIN_VERSION_base(4,8,0)` is therefore unnecessary.
* Always use custom prelude
Previously, the custom prelude was used only with older GHC versions, as
a workaround for problems with ghci. The ghci problems are resolved by
replacing package `base` with `base-noprelude`, allowing for consistent
use of the custom prelude across all GHC versions.
Diffstat (limited to 'src/Text/Pandoc/Lua/Marshaling')
-rw-r--r-- | src/Text/Pandoc/Lua/Marshaling/AST.hs | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Lua/Marshaling/AnyValue.hs | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Lua/Marshaling/CommonState.hs | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Lua/Marshaling/Context.hs | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Lua/Marshaling/List.hs | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Lua/Marshaling/MediaBag.hs | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs | 2 | ||||
-rw-r--r-- | src/Text/Pandoc/Lua/Marshaling/Version.hs | 2 |
8 files changed, 0 insertions, 16 deletions
diff --git a/src/Text/Pandoc/Lua/Marshaling/AST.hs b/src/Text/Pandoc/Lua/Marshaling/AST.hs index 68cfef5e1..a4087ad87 100644 --- a/src/Text/Pandoc/Lua/Marshaling/AST.hs +++ b/src/Text/Pandoc/Lua/Marshaling/AST.hs @@ -1,5 +1,4 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} -{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE LambdaCase #-} {- | Module : Text.Pandoc.Lua.Marshaling.AST @@ -17,7 +16,6 @@ module Text.Pandoc.Lua.Marshaling.AST , LuaListAttributes (..) ) where -import Prelude import Control.Applicative ((<|>)) import Foreign.Lua (Lua, Peekable, Pushable, StackIndex) import Text.Pandoc.Definition diff --git a/src/Text/Pandoc/Lua/Marshaling/AnyValue.hs b/src/Text/Pandoc/Lua/Marshaling/AnyValue.hs index b4830ed3b..c4720aedf 100644 --- a/src/Text/Pandoc/Lua/Marshaling/AnyValue.hs +++ b/src/Text/Pandoc/Lua/Marshaling/AnyValue.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} {- | Module : Text.Pandoc.Lua.Marshaling.AnyValue Copyright : © 2017-2020 Albert Krewinkel @@ -15,7 +14,6 @@ into HsLua. -} module Text.Pandoc.Lua.Marshaling.AnyValue (AnyValue (..)) where -import Prelude import Foreign.Lua (Peekable (peek), StackIndex) -- | Dummy type to allow values of arbitrary Lua type. This just wraps diff --git a/src/Text/Pandoc/Lua/Marshaling/CommonState.hs b/src/Text/Pandoc/Lua/Marshaling/CommonState.hs index e78acb826..636650af3 100644 --- a/src/Text/Pandoc/Lua/Marshaling/CommonState.hs +++ b/src/Text/Pandoc/Lua/Marshaling/CommonState.hs @@ -1,6 +1,5 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-# LANGUAGE LambdaCase #-} -{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE OverloadedStrings #-} {- | Module : Text.Pandoc.Lua.Marshaling.CommonState @@ -14,7 +13,6 @@ Instances to marshal (push) and unmarshal (peek) the common state. -} module Text.Pandoc.Lua.Marshaling.CommonState () where -import Prelude import Foreign.Lua (Lua, Peekable, Pushable) import Foreign.Lua.Types.Peekable (reportValueOnFailure) import Foreign.Lua.Userdata (ensureUserdataMetatable, pushAnyWithMetatable, diff --git a/src/Text/Pandoc/Lua/Marshaling/Context.hs b/src/Text/Pandoc/Lua/Marshaling/Context.hs index 9ecaa8fb7..effcc675d 100644 --- a/src/Text/Pandoc/Lua/Marshaling/Context.hs +++ b/src/Text/Pandoc/Lua/Marshaling/Context.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} {-# OPTIONS_GHC -fno-warn-orphans #-} {- | Module : Text.Pandoc.Lua.Marshaling.Context @@ -13,7 +12,6 @@ Marshaling instance for doctemplates Context and its components. -} module Text.Pandoc.Lua.Marshaling.Context () where -import Prelude import qualified Foreign.Lua as Lua import Foreign.Lua (Pushable) import Text.DocTemplates (Context(..), Val(..), TemplateTarget) diff --git a/src/Text/Pandoc/Lua/Marshaling/List.hs b/src/Text/Pandoc/Lua/Marshaling/List.hs index d1e39c993..e6614400d 100644 --- a/src/Text/Pandoc/Lua/Marshaling/List.hs +++ b/src/Text/Pandoc/Lua/Marshaling/List.hs @@ -1,7 +1,6 @@ {-# LANGUAGE DeriveDataTypeable #-} {-# LANGUAGE FlexibleInstances #-} {-# LANGUAGE MultiParamTypeClasses #-} -{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE UndecidableInstances #-} {- | Module : Text.Pandoc.Lua.Marshaling.List @@ -17,7 +16,6 @@ module Text.Pandoc.Lua.Marshaling.List ( List (..) ) where -import Prelude import Data.Data (Data) import Foreign.Lua (Peekable, Pushable) import Text.Pandoc.Walk (Walkable (..)) diff --git a/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs b/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs index 46db84a91..e9b0c5770 100644 --- a/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs +++ b/src/Text/Pandoc/Lua/Marshaling/MediaBag.hs @@ -1,4 +1,3 @@ -{-# LANGUAGE NoImplicitPrelude #-} {- | Module : Text.Pandoc.Lua.Marshaling.MediaBag Copyright : © 2012-2020 John MacFarlane @@ -11,7 +10,6 @@ Instances to marshal (push) and unmarshal (peek) media data. -} module Text.Pandoc.Lua.Marshaling.MediaBag (pushIterator) where -import Prelude import Foreign.Ptr (Ptr) import Foreign.StablePtr (StablePtr, deRefStablePtr, newStablePtr) import Foreign.Lua (Lua, NumResults, Peekable, Pushable, StackIndex) diff --git a/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs b/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs index 418703969..2e45affe4 100644 --- a/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs +++ b/src/Text/Pandoc/Lua/Marshaling/ReaderOptions.hs @@ -1,5 +1,4 @@ {-# LANGUAGE LambdaCase #-} -{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} {-# OPTIONS_GHC -fno-warn-orphans #-} @@ -16,7 +15,6 @@ Marshaling instance for ReaderOptions and its components. -} module Text.Pandoc.Lua.Marshaling.ReaderOptions () where -import Prelude import Data.Data (showConstr, toConstr) import Foreign.Lua (Lua, Pushable) import Text.Pandoc.Extensions (Extensions) diff --git a/src/Text/Pandoc/Lua/Marshaling/Version.hs b/src/Text/Pandoc/Lua/Marshaling/Version.hs index 9bbb147f0..090725afc 100644 --- a/src/Text/Pandoc/Lua/Marshaling/Version.hs +++ b/src/Text/Pandoc/Lua/Marshaling/Version.hs @@ -1,6 +1,5 @@ {-# OPTIONS_GHC -fno-warn-orphans #-} {-# LANGUAGE LambdaCase #-} -{-# LANGUAGE NoImplicitPrelude #-} {-# LANGUAGE OverloadedStrings #-} {-# LANGUAGE ScopedTypeVariables #-} {- | @@ -20,7 +19,6 @@ module Text.Pandoc.Lua.Marshaling.Version ) where -import Prelude import Data.Text (Text) import Data.Maybe (fromMaybe) import Data.Version (Version (..), makeVersion, parseVersion, showVersion) |