From e4f4be6c8010e9d2913af12dc6177f4f7ca84b17 Mon Sep 17 00:00:00 2001
From: Albert Krewinkel <albert@zeitkraut.de>
Date: Mon, 28 Mar 2022 22:23:36 +0200
Subject: [PATCH] Remove redundant dependency on hslua-marshalling.
The package is a dependency of hslua; all important modules are
re-exported.
---
pandoc.cabal | 1 -
src/Text/Pandoc/Lua/ErrorConversion.hs | 3 +--
src/Text/Pandoc/Lua/Marshal/CommonState.hs | 4 +---
src/Text/Pandoc/Lua/Marshal/PandocError.hs | 3 +--
4 files changed, 3 insertions(+), 8 deletions(-)
diff --git a/pandoc.cabal b/pandoc.cabal
index 48ab8653c..b404d886a 100644
--- a/pandoc.cabal
+++ b/pandoc.cabal
@@ -488,7 +488,6 @@ library
file-embed >= 0.0 && < 0.1,
filepath >= 1.1 && < 1.5,
haddock-library >= 1.10 && < 1.11,
- hslua-marshalling >= 2.1 && < 2.3,
hslua-module-doclayout>= 1.0.2 && < 1.1,
hslua-module-path >= 1.0 && < 1.1,
hslua-module-system >= 1.0 && < 1.1,
diff --git a/src/Text/Pandoc/Lua/ErrorConversion.hs b/src/Text/Pandoc/Lua/ErrorConversion.hs
index 2083f99dd..3968eba84 100644
--- a/src/Text/Pandoc/Lua/ErrorConversion.hs
+++ b/src/Text/Pandoc/Lua/ErrorConversion.hs
@@ -14,8 +14,7 @@ module Text.Pandoc.Lua.ErrorConversion
( addContextToException
) where
-import HsLua (LuaError, LuaE, top)
-import HsLua.Marshalling (resultToEither, runPeek)
+import HsLua (LuaError, LuaE, resultToEither, runPeek, top)
import Text.Pandoc.Error (PandocError (PandocLuaError))
import Text.Pandoc.Lua.Marshal.PandocError (pushPandocError, peekPandocError)
diff --git a/src/Text/Pandoc/Lua/Marshal/CommonState.hs b/src/Text/Pandoc/Lua/Marshal/CommonState.hs
index 7ca1b7e62..74ce69887 100644
--- a/src/Text/Pandoc/Lua/Marshal/CommonState.hs
+++ b/src/Text/Pandoc/Lua/Marshal/CommonState.hs
@@ -15,9 +15,7 @@ module Text.Pandoc.Lua.Marshal.CommonState
, pushCommonState
) where
-import HsLua.Core
-import HsLua.Marshalling
-import HsLua.Packaging
+import HsLua
import Text.Pandoc.Class (CommonState (..))
import Text.Pandoc.Logging (LogMessage, showLogMessage)
import Text.Pandoc.Lua.Marshal.List (pushPandocList)
diff --git a/src/Text/Pandoc/Lua/Marshal/PandocError.hs b/src/Text/Pandoc/Lua/Marshal/PandocError.hs
index 934c69ec3..7f83f2fc0 100644
--- a/src/Text/Pandoc/Lua/Marshal/PandocError.hs
+++ b/src/Text/Pandoc/Lua/Marshal/PandocError.hs
@@ -19,8 +19,7 @@ module Text.Pandoc.Lua.Marshal.PandocError
)
where
-import HsLua.Core (LuaError)
-import HsLua.Marshalling (Peeker, Pusher, pushString, liftLua)
+import HsLua (LuaError, Peeker, Pusher, liftLua, pushString)
import HsLua.Packaging
import Text.Pandoc.Error (PandocError (PandocLuaError))