From 51fdf38c71fe1ccb7b9f204138c4d7754740f1d7 Mon Sep 17 00:00:00 2001 From: Ian Jeffries Date: Sun, 1 Jan 2017 18:45:08 -0500 Subject: [PATCH] Rename `msg` to `fatalErrorMessage`. (#34) This is to free up `msg` as a variable name. --- CHANGES.md | 1 + Symbols.md | 2 +- docs/Exceptions.md | 2 +- src/Panic.hs | 2 +- 4 files changed, 4 insertions(+), 3 deletions(-) diff --git a/CHANGES.md b/CHANGES.md index 0c9f7da8f..807f83eae 100644 --- a/CHANGES.md +++ b/CHANGES.md @@ -5,6 +5,7 @@ * Switch exported `(<>)` to be from `Data.Monoid` instead of Semigroup. * Expose `putByteString` and `putLByteString` monomorphic versions of `putStrLn` functions * Export `genericLength` and other generic list return functions. +* Rename `msg` to `fatalErrorMessage`. * Export `ExceptT`, `ReaderT`, and `StateT` constructors. * Export `NonEmpty` type and constructor for GHC 8.0. diff --git a/Symbols.md b/Symbols.md index 93cf202e9..5c93f7e3a 100644 --- a/Symbols.md +++ b/Symbols.md @@ -426,6 +426,7 @@ * expt * expts * expts10 +* fatalErrorMessage * filter * filterM * finally @@ -658,7 +659,6 @@ * modifyMVarMasked_ * modifyMVar_ * mplus -* msg * msum * myThreadId * mzero diff --git a/docs/Exceptions.md b/docs/Exceptions.md index ec0eae09c..e528f9406 100644 --- a/docs/Exceptions.md +++ b/docs/Exceptions.md @@ -110,7 +110,7 @@ Fatal Errors ------------ ```haskell -data FatalError = FatalError {msg :: Text} +data FatalError = FatalError {fatalErrorMessage :: Text} ``` #### panic diff --git a/src/Panic.hs b/src/Panic.hs index 19e994ebf..6055bc6dc 100644 --- a/src/Panic.hs +++ b/src/Panic.hs @@ -12,7 +12,7 @@ import Data.Typeable (Typeable) import Control.Exception as X -- | Uncatchable exceptions thrown and never caught. -data FatalError = FatalError { msg :: Text } +data FatalError = FatalError { fatalErrorMessage :: Text } deriving (Show, Typeable) instance Exception FatalError