Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Build against turtle-1.6 #2431

Merged
merged 3 commits into from
Jul 3, 2022
Merged

Build against turtle-1.6 #2431

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
816d2d2
Build against `turtle-1.6`
Gabriella439 Jul 2, 2022
297a06c
Add FIXME
Gabriella439 Jul 2, 2022
e197cf6
Add FIXME
Gabriella439 Jul 2, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion dhall/dhall.cabal
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,7 +419,7 @@ Test-Suite tasty
tasty-quickcheck >= 0.9.2 && < 0.11,
tasty-silver < 3.4 ,
temporary >= 1.2.1 && < 1.4 ,
turtle < 1.6 ,
turtle < 1.7 ,
Default-Language: Haskell2010

Test-Suite doctest
Expand Down
3 changes: 3 additions & 0 deletions dhall/tests/Dhall/Test/Freeze.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,8 @@
{-# LANGUAGE OverloadedStrings #-}

-- FIXME: Re-enable deprecation warnings after removing support for turtle < 1.6.
{-# OPTIONS_GHC -Wno-deprecations #-}
Gabriella439 marked this conversation as resolved.
Show resolved Hide resolved

module Dhall.Test.Freeze where

import Data.Text (Text)
Expand Down
18 changes: 10 additions & 8 deletions dhall/tests/Dhall/Test/Import.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,16 +2,18 @@
{-# LANGUAGE OverloadedStrings #-}
{-# LANGUAGE TypeApplications #-}

-- FIXME: Re-enable deprecation warnings after removing support for turtle < 1.6.
{-# OPTIONS_GHC -Wno-deprecations #-}
Gabriella439 marked this conversation as resolved.
Show resolved Hide resolved

module Dhall.Test.Import where

import Control.Exception (SomeException)
import Data.Foldable (fold)
import Data.Text (Text, isSuffixOf)
import Data.Void (Void)
import Filesystem.Path.CurrentOS (toText)
import Prelude hiding (FilePath)
import Test.Tasty (TestTree)
import Turtle (FilePath, (</>))
import Control.Exception (SomeException)
import Data.Foldable (fold)
import Data.Text (Text, isSuffixOf)
import Data.Void (Void)
import Prelude hiding (FilePath)
import Test.Tasty (TestTree)
import Turtle (FilePath, toText, (</>))

import qualified Control.Exception as Exception
import qualified Control.Monad as Monad
Expand Down