DynFlags: Support British spelling of GeneralisedNewtypeDeriving
authorBen Gamari <bgamari.foss@gmail.com>
Fri, 2 Mar 2018 19:18:48 +0000 (14:18 -0500)
committerBen Gamari <ben@smart-cactus.org>
Fri, 2 Mar 2018 20:41:04 +0000 (15:41 -0500)
Reviewers: dfeuer

Reviewed By: dfeuer

Subscribers: dfeuer, rwbarton, thomie, carter

GHC Trac Issues: #14819

Differential Revision: https://phabricator.haskell.org/D4422

compiler/main/DynFlags.hs
docs/users_guide/8.6.1-notes.rst
docs/users_guide/glasgow_exts.rst
testsuite/tests/driver/T4437.hs

index 873ac3b..99a798e 100644 (file)
@@ -4122,6 +4122,8 @@ xFlagsDeps = [
   flagSpec "GHCForeignImportPrim"             LangExt.GHCForeignImportPrim,
   flagSpec' "GeneralizedNewtypeDeriving"      LangExt.GeneralizedNewtypeDeriving
                                               setGenDeriving,
+  flagSpec' "GeneralisedNewtypeDeriving"      LangExt.GeneralizedNewtypeDeriving
+                                              setGenDeriving,
   flagSpec "ImplicitParams"                   LangExt.ImplicitParams,
   flagSpec "ImplicitPrelude"                  LangExt.ImplicitPrelude,
   flagSpec "ImpredicativeTypes"               LangExt.ImpredicativeTypes,
index f5f2a5a..17617ac 100644 (file)
@@ -54,6 +54,8 @@ Compiler
   calling the C compiler. Instead we use :ghc-flag:`-iquote` to only add it as
   an include path for `#include ""`. See :ghc-ticket:`14312`.
 
+- GHC now supports British spelling of :extension:`GeneralizedNewtypeDeriving`.
+
 Runtime system
 ~~~~~~~~~~~~~~
 
index 439f4d2..40013f3 100644 (file)
@@ -4586,7 +4586,7 @@ Generalised derived instances for newtypes
                GeneralizedNewtypeDeriving
     :shortdesc: Enable newtype deriving.
 
-    :since: 6.8.1
+    :since: 6.8.1. British spelling since 8.6.1.
 
     Enable GHC's cunning generalised deriving mechanism for ``newtype``\s
 
index 6a46e52..d82e434 100644 (file)
@@ -40,7 +40,8 @@ expectedGhcOnlyExtensions = ["RelaxedLayout",
                              "AlternativeLayoutRule",
                              "AlternativeLayoutRuleTransitional",
                              "EmptyDataDeriving",
-                             "NumericUnderscores"]
+                             "NumericUnderscores",
+                             "GeneralisedNewtypeDeriving"]
 
 expectedCabalOnlyExtensions :: [String]
 expectedCabalOnlyExtensions = ["Generics",