summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJose Pedro Magalhaes <jpm@cs.ox.ac.uk>2013-03-08 08:04:37 +0000
committerJose Pedro Magalhaes <jpm@cs.ox.ac.uk>2013-03-08 10:43:45 +0000
commita684a5518f7bb6cf5ecaa72d28ba6d976c87e230 (patch)
treec922e6776f65306f65db1bd3bd0a38993f9b21e2
parentf6e9c261314878e9b5a0ad51edbf31ce0d4ba607 (diff)
downloadhaskell-a684a5518f7bb6cf5ecaa72d28ba6d976c87e230.tar.gz
Make AutoDeriveTypeable imply DeriveDataTypeable
-rw-r--r--compiler/main/DynFlags.hs3
-rw-r--r--docs/users_guide/flags.xml3
-rw-r--r--docs/users_guide/glasgow_exts.xml3
3 files changed, 7 insertions, 2 deletions
diff --git a/compiler/main/DynFlags.hs b/compiler/main/DynFlags.hs
index 479516d50f..b179420c7f 100644
--- a/compiler/main/DynFlags.hs
+++ b/compiler/main/DynFlags.hs
@@ -2728,6 +2728,9 @@ impliedFlags
, (Opt_TypeFamilies, turnOn, Opt_KindSignatures) -- Type families use kind signatures
, (Opt_PolyKinds, turnOn, Opt_KindSignatures) -- Ditto polymorphic kinds
+ -- AutoDeriveTypeable is not very useful without DeriveDataTypeable
+ , (Opt_AutoDeriveTypeable, turnOn, Opt_DeriveDataTypeable)
+
-- We turn this on so that we can export associated type
-- type synonyms in subordinates (e.g. MyClass(type AssocType))
, (Opt_TypeFamilies, turnOn, Opt_ExplicitNamespaces)
diff --git a/docs/users_guide/flags.xml b/docs/users_guide/flags.xml
index 299b4d527b..f5f51b0d4e 100644
--- a/docs/users_guide/flags.xml
+++ b/docs/users_guide/flags.xml
@@ -1069,7 +1069,8 @@
</row>
<row>
<entry><option>-XAutoDeriveTypeable</option></entry>
- <entry>Automatically <link linkend="auto-derive-typeable">derive Typeable instances for every datatype and type class declaration</link>.</entry>
+ <entry>Automatically <link linkend="auto-derive-typeable">derive Typeable instances for every datatype and type class declaration</link>.
+ Implies <option>-XDeriveDataTypeable</option>.</entry>
<entry>dynamic</entry>
<entry><option>-XNoAutoDeriveTypeable</option></entry>
</row>
diff --git a/docs/users_guide/glasgow_exts.xml b/docs/users_guide/glasgow_exts.xml
index 03682bf848..16d180aaba 100644
--- a/docs/users_guide/glasgow_exts.xml
+++ b/docs/users_guide/glasgow_exts.xml
@@ -3434,7 +3434,8 @@ can be mentioned in the <literal>deriving</literal> clause.
<para>
The flag <option>-XAutoDeriveTypeable</option> triggers the generation
of derived <literal>Typeable</literal> instances for every datatype and type
-class declaration in the module it is used.
+class declaration in the module it is used. This flag implies
+<option>-XDeriveDataTypeable</option> (<xref linkend="deriving-typeable"/>).
</para>
</sect2>