diff --git a/CHANGES.md b/CHANGES.md index e8cf01504..856191737 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -1,9 +1,11 @@ 0.1.6 ===== +* Adds uncatchable panic exception throwing using Text message. * Removes ``printf`` * Removes ``string-conv`` dependency so Stack build works without ``extra-deps``. * Brings ``Callstack`` machinery in for GHC 8.x. +* Removes ``throw`` and ``assert`` from ``Control.Exception`` exports. 0.1.5 ===== diff --git a/src/Base.hs b/src/Base.hs index 2aa51cc6f..879c69430 100644 --- a/src/Base.hs +++ b/src/Base.hs @@ -61,14 +61,14 @@ import GHC.OverloadedLabels as X ( ) import GHC.ExecutionStack as X ( - Location(..), + Location(..) , SrcLoc(..) , getStackTrace , showStackTrace ) import GHC.Stack as X ( - , CallStack + CallStack , HasCallStack , callStack , SrcLoc diff --git a/src/Protolude.hs b/src/Protolude.hs index 8dfcc6489..24fc3645f 100644 --- a/src/Protolude.hs +++ b/src/Protolude.hs @@ -311,7 +311,10 @@ import System.IO as X ( import Control.Monad.ST as X -- Concurrency and Parallelism -import Control.Exception as X +import Control.Exception as X hiding ( + throw + , assert + ) import Control.Monad.STM as X import Control.Concurrent as X import Control.Concurrent.Async as X