From 8fc8ff12d6eb2dc0d010c9cd090e42dece9484c7 Mon Sep 17 00:00:00 2001
From: Sean Gillespie <sean@mistersg.net>
Date: Mon, 25 Dec 2017 20:22:41 -0500
Subject: [PATCH] Upgrade lts-10.0
---
src/Language/Lambda/Expression.hs | 2 +-
src/Language/Lambda/Parser.hs | 2 +-
src/Language/SystemF/Parser.hs | 3 ++-
stack.yaml | 3 ++-
4 files changed, 6 insertions(+), 4 deletions(-)
diff --git a/src/Language/Lambda/Expression.hs b/src/Language/Lambda/Expression.hs
index 1475cb0..13e29b2 100644
--- a/src/Language/Lambda/Expression.hs
+++ b/src/Language/Lambda/Expression.hs
@@ -1,7 +1,7 @@
{-# LANGUAGE FlexibleInstances #-}
module Language.Lambda.Expression where
-import Prelude hiding (abs, uncurry)
+import Prelude hiding (uncurry)
import Language.Lambda.Util.PrettyPrint
diff --git a/src/Language/Lambda/Parser.hs b/src/Language/Lambda/Parser.hs
index 821af3b..99fe676 100644
--- a/src/Language/Lambda/Parser.hs
+++ b/src/Language/Lambda/Parser.hs
@@ -1,7 +1,7 @@
module Language.Lambda.Parser (parseExpr) where
import Control.Monad
-import Prelude hiding (abs, curry, id)
+import Prelude hiding (abs, curry)
import Text.Parsec
import Text.Parsec.String
diff --git a/src/Language/SystemF/Parser.hs b/src/Language/SystemF/Parser.hs
index 23aae48..30505da 100644
--- a/src/Language/SystemF/Parser.hs
+++ b/src/Language/SystemF/Parser.hs
@@ -4,6 +4,7 @@ module Language.SystemF.Parser (
) where
import Control.Monad
+import Data.Functor
import Prelude hiding (abs)
import Text.Parsec
@@ -53,7 +54,7 @@ ty :: Parser (Ty String)
ty = try arrow
arrow :: Parser (Ty String)
-arrow = chainr1 tyterm (symbol' "->" *> return TyArrow)
+arrow = chainr1 tyterm (symbol' "->" $> TyArrow)
tyterm :: Parser (Ty String)
tyterm = tyvar <|> parens ty
diff --git a/stack.yaml b/stack.yaml
index 3fc81bb..0639b74 100644
--- a/stack.yaml
+++ b/stack.yaml
@@ -5,4 +5,5 @@ packages:
extra-deps:
- Shellac-0.9.9
- Shellac-readline-0.9.9
-resolver: lts-8.19
+- readline-1.0.3.0
+resolver: lts-10.0
--
GitLab