Removed depecated functions

dhall/tests/Dhall/Test/Freeze.hs

@@ -1,8 +1,5 @@
 {-# LANGUAGE OverloadedStrings #-}
 
--- FIXME: Re-enable deprecation warnings after removing support for turtle < 1.6.
-{-# OPTIONS_GHC -Wno-deprecations #-}
-
 module Dhall.Test.Freeze where
 
 import Data.Text    (Text)
@@ -53,7 +50,7 @@ freezeTest dir intent prefix =
 
         parsedInput <- Core.throws (Parser.exprFromText mempty inputText)
 
-        actualExpression <- Freeze.freezeExpression (Turtle.encodeString dir) AllImports intent parsedInput
+        actualExpression <- Freeze.freezeExpression dir AllImports intent parsedInput
 
         let actualText = Core.pretty actualExpression <> "\n"
 

dhall/tests/Dhall/Test/Import.hs

@@ -2,18 +2,13 @@
 {-# LANGUAGE OverloadedStrings #-}
 {-# LANGUAGE TypeApplications  #-}
 
--- FIXME: Re-enable deprecation warnings after removing support for turtle < 1.6.
-{-# OPTIONS_GHC -Wno-deprecations #-}
-
 module Dhall.Test.Import where
 
 import Control.Exception (SomeException)
-import Data.Foldable     (fold)
 import Data.Text         (Text, isSuffixOf)
 import Data.Void         (Void)
-import Prelude           hiding (FilePath)
+import System.FilePath   ((</>))
 import Test.Tasty        (TestTree)
-import Turtle            (FilePath, toText, (</>))
 
 import qualified Control.Exception                as Exception
 import qualified Control.Monad                    as Monad
@@ -102,7 +97,7 @@ getTests = do
                 ]
 
         _ <- Monad.guard (path `notElem` expectedSuccesses)
-        _ <- Monad.guard (not ("ENV.dhall" `isSuffixOf` (fold (toText path))))
+        _ <- Monad.guard (not ("ENV.dhall" `isSuffixOf` Text.pack path))
         return path )
 
     let testTree =
@@ -176,7 +171,7 @@ successTest prefix = do
                 not (null (Turtle.match (Turtle.ends path') (Test.Util.toDhallPath prefix)))
 
         let buildNewCache = do
-                tempdir <- fmap Turtle.decodeString (Turtle.managed (Temp.withSystemTempDirectory "dhall-cache"))
+                tempdir <- Turtle.managed (Temp.withSystemTempDirectory "dhall-cache")
                 Turtle.liftIO (Turtle.cptree originalCache tempdir)
                 return tempdir