ehmry/dhall-haskell
ehmry/dhall-haskell
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix dhall freeze to always re-freeze an import (#1471)

Browse Source 
Fixes https://github.com/dhall-lang/dhall-haskell/issues/1470

`dhall freeze` no longer attempts to use the cache to fetch an import since
the cache might not match the underlying import any longer.  Instead,
`dhall freeze` now always attempts to fetch the underlying import to
compute the new hash.
This commit is contained in:
Gabriel Gonzalez 2019-10-24 08:19:09 -07:00 committed by mergify[bot]
parent 8f2c28a5dc
commit 90315e9eda
1 changed files with 2 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
dhall/src/Dhall/Freeze.hs
View File

@ -14,13 +14,11 @@ module Dhall.Freeze
, Intent(..)
) where
import Control.Exception (SomeException)
import Data.Monoid ((<>))
import Data.Text
import Data.Void (Void)
import Dhall.Syntax (Expr(..), Import(..), ImportHashed(..), ImportType(..))
import Dhall.Parser (Src)
import Dhall.Pretty (CharacterSet, annToAnsiStyle, layoutOpts, prettyCharacterSet)
import Dhall.Syntax (Expr(..), Import(..), ImportHashed(..), ImportType(..))
import Dhall.Util (Censor, Input(..))
import System.Console.ANSI (hSupportsANSI)
@ -54,15 +52,7 @@ freezeImport directory import_ = do
let status = Dhall.Import.emptyStatus directory
let download =
State.evalStateT (Dhall.Import.loadWith (Embed import_)) status
-- Try again without the semantic integrity check if decoding fails
let handler :: SomeException -> IO (Expr Src Void)
handler _ = do
State.evalStateT (Dhall.Import.loadWith (Embed unprotectedImport)) status
expression <- Control.Exception.handle handler download
expression <- State.evalStateT (Dhall.Import.loadWith (Embed unprotectedImport)) status
case Dhall.TypeCheck.typeOf expression of
Left exception -> Control.Exception.throwIO exception