summaryrefslogtreecommitdiff
path: root/libraries
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2015-04-14 01:12:22 -0500
committerAustin Seipp <austin@well-typed.com>2015-04-14 01:19:18 -0500
commita5745d2b3112312a9e8c486142fb99b9d02e9827 (patch)
tree4701e3f7f51b036d7a88f8bf6af514af3171aa05 /libraries
parentedc059a425068f9bf4a60520e8d8906bc764e2b5 (diff)
downloadhaskell-a5745d2b3112312a9e8c486142fb99b9d02e9827.tar.gz
Derive Generic instance for System.Exit.ExitCode
Reviewed By: austin Differential Revision: https://phabricator.haskell.org/D830
Diffstat (limited to 'libraries')
-rw-r--r--libraries/base/GHC/IO/Exception.hs5
-rw-r--r--libraries/base/changelog.md2
2 files changed, 5 insertions, 2 deletions
diff --git a/libraries/base/GHC/IO/Exception.hs b/libraries/base/GHC/IO/Exception.hs
index b7e05b5606..9cf78b39c1 100644
--- a/libraries/base/GHC/IO/Exception.hs
+++ b/libraries/base/GHC/IO/Exception.hs
@@ -1,5 +1,5 @@
{-# LANGUAGE Trustworthy #-}
-{-# LANGUAGE NoImplicitPrelude, MagicHash,
+{-# LANGUAGE DeriveGeneric, NoImplicitPrelude, MagicHash,
ExistentialQuantification #-}
{-# OPTIONS_GHC -funbox-strict-fields #-}
{-# OPTIONS_HADDOCK hide #-}
@@ -44,6 +44,7 @@ module GHC.IO.Exception (
) where
import GHC.Base
+import GHC.Generics
import GHC.List
import GHC.IO
import GHC.Show
@@ -225,7 +226,7 @@ data ExitCode
-- The exact interpretation of the code is
-- operating-system dependent. In particular, some values
-- may be prohibited (e.g. 0 on a POSIX-compliant system).
- deriving (Eq, Ord, Read, Show)
+ deriving (Eq, Ord, Read, Show, Generic)
instance Exception ExitCode
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index ea509af2e2..56b9faedf1 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -31,6 +31,8 @@
* `Complex` now has a `Generic` instance
+ * `System.Exit.ExitCode` now has a `Generic` instance
+
## 4.8.0.0 *Mar 2015*
* Bundled with GHC 7.10.1