From 613e929d91dfc46ecfc5e28479098ce52aeb56f6 Mon Sep 17 00:00:00 2001
From: Eugen Wissner <belka@caraus.de>
Date: Thu, 20 Feb 2020 05:16:14 +0100
Subject: Update to Stack 15.x

---
 src/Language/GraphQL/AST/Encoder.hs |  1 -
 src/Language/GraphQL/Error.hs       | 21 ++++++++++++---------
 2 files changed, 12 insertions(+), 10 deletions(-)

(limited to 'src/Language/GraphQL')

diff --git a/src/Language/GraphQL/AST/Encoder.hs b/src/Language/GraphQL/AST/Encoder.hs
index eb865c9..9b293bf 100644
--- a/src/Language/GraphQL/AST/Encoder.hs
+++ b/src/Language/GraphQL/AST/Encoder.hs
@@ -15,7 +15,6 @@ module Language.GraphQL.AST.Encoder
 
 import Data.Char (ord)
 import Data.Foldable (fold)
-import Data.Monoid ((<>))
 import qualified Data.List.NonEmpty as NonEmpty
 import Data.Text (Text)
 import qualified Data.Text as Text
diff --git a/src/Language/GraphQL/Error.hs b/src/Language/GraphQL/Error.hs
index 41a2a9c..91911b7 100644
--- a/src/Language/GraphQL/Error.hs
+++ b/src/Language/GraphQL/Error.hs
@@ -20,18 +20,20 @@ import Control.Monad.Trans.State ( StateT
                                  , modify
                                  , runStateT
                                  )
-import Text.Megaparsec ( ParseErrorBundle(..)
-                       , SourcePos(..)
-                       , errorOffset
-                       , parseErrorTextPretty
-                       , reachOffset
-                       , unPos
-                       )
+import Text.Megaparsec
+    ( ParseErrorBundle(..)
+    , PosState(..)
+    , SourcePos(..)
+    , errorOffset
+    , parseErrorTextPretty
+    , reachOffset
+    , unPos
+    )
 
 -- | Wraps a parse error into a list of errors.
 parseError :: Applicative f => ParseErrorBundle Text Void -> f Aeson.Value
 parseError ParseErrorBundle{..}  =
-  pure $ Aeson.object [("errors", Aeson.toJSON $ fst $ foldl go ([], bundlePosState) bundleErrors)]
+    pure $ Aeson.object [("errors", Aeson.toJSON $ fst $ foldl go ([], bundlePosState) bundleErrors)]
   where
     errorObject s SourcePos{..} = Aeson.object
         [ ("message", Aeson.toJSON $ init $ parseErrorTextPretty s)
@@ -39,7 +41,8 @@ parseError ParseErrorBundle{..}  =
         , ("column", Aeson.toJSON $ unPos sourceColumn)
         ]
     go (result, state) x =
-        let (sourcePosition, _, newState) = reachOffset (errorOffset x) state
+        let (_, newState) = reachOffset (errorOffset x) state
+            sourcePosition = pstateSourcePos newState
          in (errorObject x sourcePosition : result, newState)
 
 -- | A wrapper to pass error messages around.
-- 
cgit v1.2.3