[commit: ghc] master: Rip out __HADDOCK__ references (3353f62)

[git at git.haskell.org]

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/3353f62ab8658346b0084fe6382edeb86d104012/ghc

>---------------------------------------------------------------

commit 3353f62ab8658346b0084fe6382edeb86d104012
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Thu Nov 12 20:35:47 2015 +0100

    Rip out __HADDOCK__ references
    
    As it turns out no one actually sets this macro anyways and haddock
    now clearly has no trouble parsing this code.
    
    Test Plan: Validate
    
    Reviewers: hvr, goldfire, austin
    
    Reviewed By: austin
    
    Subscribers: duncan, thomie, hvr
    
    Differential Revision: https://phabricator.haskell.org/D1463


>---------------------------------------------------------------

3353f62ab8658346b0084fe6382edeb86d104012
 libraries/base/Foreign/Marshal/Error.hs      | 4 ----
 libraries/base/GHC/Base.hs                   | 8 --------
 libraries/base/GHC/ConsoleHandler.hs         | 2 +-
 libraries/integer-simple/GHC/Integer/Type.hs | 4 ----
 4 files changed, 1 insertion(+), 17 deletions(-)

diff --git a/libraries/base/Foreign/Marshal/Error.hs b/libraries/base/Foreign/Marshal/Error.hs
index 758812b..be75043 100644
--- a/libraries/base/Foreign/Marshal/Error.hs
+++ b/libraries/base/Foreign/Marshal/Error.hs
@@ -30,10 +30,6 @@ module Foreign.Marshal.Error (
 
 import Foreign.Ptr
 
-#ifdef __HADDOCK__
-import Data.Bool
-import System.IO.Error
-#endif
 import GHC.Base
 import GHC.Num
 import GHC.IO.Exception
diff --git a/libraries/base/GHC/Base.hs b/libraries/base/GHC/Base.hs
index 189e480..199664d 100644
--- a/libraries/base/GHC/Base.hs
+++ b/libraries/base/GHC/Base.hs
@@ -1204,11 +1204,3 @@ a `iShiftRL#` b | isTrue# (b >=# WORD_SIZE_IN_BITS#) = 0#
 --      unpackFoldr "foo" c (unpackFoldr "baz" c n)  =  unpackFoldr "foobaz" c n
 
   #-}
-
-
-#ifdef __HADDOCK__
--- | A special argument for the 'Control.Monad.ST.ST' type constructor,
--- indexing a state embedded in the 'Prelude.IO' monad by
--- 'Control.Monad.ST.stToIO'.
-data RealWorld
-#endif
diff --git a/libraries/base/GHC/ConsoleHandler.hs b/libraries/base/GHC/ConsoleHandler.hs
index 126e174..609eb20 100644
--- a/libraries/base/GHC/ConsoleHandler.hs
+++ b/libraries/base/GHC/ConsoleHandler.hs
@@ -19,7 +19,7 @@
 -----------------------------------------------------------------------------
 
 module GHC.ConsoleHandler
-#if !defined(mingw32_HOST_OS) && !defined(__HADDOCK__)
+#if !defined(mingw32_HOST_OS)
         where
 
 import GHC.Base ()  -- dummy dependency
diff --git a/libraries/integer-simple/GHC/Integer/Type.hs b/libraries/integer-simple/GHC/Integer/Type.hs
index cd39b7d..31f852b 100644
--- a/libraries/integer-simple/GHC/Integer/Type.hs
+++ b/libraries/integer-simple/GHC/Integer/Type.hs
@@ -34,8 +34,6 @@ import GHC.Tuple ()
 import GHC.IntWord64
 #endif
 
-#if !defined(__HADDOCK__)
-
 data Integer = Positive !Positive | Negative !Positive | Naught
 
 -------------------------------------------------------------------
@@ -868,8 +866,6 @@ floatFromPositive (Some w ds)
              (2.0# `powerFloat#` int2Float# (highHalfShift ())))
        `plusFloat#` int2Float# (word2Int# l)
 
-#endif
-
 {-
 Note [Avoid patError]