[commit: haddock] 2.17.3.1-spanfix, v2.17, v2.17.3: Disable NFData instances for GHC types when GHC >= 8.0.2 (c11843f)
git at git.haskell.org
git at git.haskell.org
Tue Nov 28 11:49:31 UTC 2017
Repository : ssh://git@git.haskell.org/haddock
On branches: 2.17.3.1-spanfix,v2.17,v2.17.3
Link : http://git.haskell.org/haddock.git/commitdiff/c11843febef519b3d9164603ead06ee0fdb54ee5
>---------------------------------------------------------------
commit c11843febef519b3d9164603ead06ee0fdb54ee5
Author: Simon Marlow <smarlow at fb.com>
Date: Fri Jul 22 02:55:04 2016 -0700
Disable NFData instances for GHC types when GHC >= 8.0.2
(cherry picked from commit a3309e797c42dae9bccdeb17ce52fcababbaff8a)
(cherry picked from commit d9bb5fc3823d720783e31e1e95ed5ed35c721b7b)
>---------------------------------------------------------------
c11843febef519b3d9164603ead06ee0fdb54ee5
haddock-api/src/Haddock/Types.hs | 8 ++++++--
1 file changed, 6 insertions(+), 2 deletions(-)
diff --git a/haddock-api/src/Haddock/Types.hs b/haddock-api/src/Haddock/Types.hs
index eacf447..1703778 100644
--- a/haddock-api/src/Haddock/Types.hs
+++ b/haddock-api/src/Haddock/Types.hs
@@ -1,4 +1,6 @@
-{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving, TypeFamilies, RecordWildCards #-}
+{-# LANGUAGE CPP #-}
+{-# LANGUAGE DeriveDataTypeable, DeriveFunctor, DeriveFoldable, DeriveTraversable, StandaloneDeriving #-}
+{-# LANGUAGE TypeFamilies, RecordWildCards #-}
{-# OPTIONS_GHC -fno-warn-orphans #-}
-----------------------------------------------------------------------------
-- |
@@ -447,10 +449,12 @@ instance (NFData a, NFData mod)
DocExamples a -> a `deepseq` ()
DocHeader a -> a `deepseq` ()
-
+#if !MIN_VERSION_ghc(8,0,2)
+-- These were added to GHC itself in 8.0.2
instance NFData Name where rnf x = seq x ()
instance NFData OccName where rnf x = seq x ()
instance NFData ModuleName where rnf x = seq x ()
+#endif
instance NFData id => NFData (Header id) where
rnf (Header a b) = a `deepseq` b `deepseq` ()
More information about the ghc-commits
mailing list