[commit: ghc] ghc-7.10: RTS.Flags: Rename Nat to RtsNat (10c61bf)

[git at git.haskell.org]

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

On branch  : ghc-7.10
Link       : http://ghc.haskell.org/trac/ghc/changeset/10c61bfd6a6645da3ee896b3f04b960a308aa0dd/ghc

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

commit 10c61bfd6a6645da3ee896b3f04b960a308aa0dd
Author: Ben Gamari <ben at smart-cactus.org>
Date:   Thu Sep 24 01:25:06 2015 +0200

    RTS.Flags: Rename Nat to RtsNat


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

10c61bfd6a6645da3ee896b3f04b960a308aa0dd
 libraries/base/GHC/RTS/Flags.hsc | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

diff --git a/libraries/base/GHC/RTS/Flags.hsc b/libraries/base/GHC/RTS/Flags.hsc
index b8b2973..d2afcab 100644
--- a/libraries/base/GHC/RTS/Flags.hsc
+++ b/libraries/base/GHC/RTS/Flags.hsc
@@ -57,7 +57,7 @@ import GHC.Word
 type RtsTime = Word64
 
 -- | @'nat'@ defined in @rts/Types.h@
-type Nat = #{type unsigned int}
+type RtsNat = #{type unsigned int}
 
 data GiveGCStats
     = NoGCStats
@@ -84,19 +84,19 @@ instance Enum GiveGCStats where
 data GCFlags = GCFlags
     { statsFile             :: Maybe FilePath
     , giveStats             :: GiveGCStats
-    , maxStkSize            :: Nat
-    , initialStkSize        :: Nat
-    , stkChunkSize          :: Nat
-    , stkChunkBufferSize    :: Nat
-    , maxHeapSize           :: Nat
-    , minAllocAreaSize      :: Nat
-    , minOldGenSize         :: Nat
-    , heapSizeSuggestion    :: Nat
+    , maxStkSize            :: RtsNat
+    , initialStkSize        :: RtsNat
+    , stkChunkSize          :: RtsNat
+    , stkChunkBufferSize    :: RtsNat
+    , maxHeapSize           :: RtsNat
+    , minAllocAreaSize      :: RtsNat
+    , minOldGenSize         :: RtsNat
+    , heapSizeSuggestion    :: RtsNat
     , heapSizeSuggestionAuto :: Bool
     , oldGenFactor          :: Double
     , pcFreeHeap            :: Double
-    , generations           :: Nat
-    , steps                 :: Nat
+    , generations           :: RtsNat
+    , steps                 :: RtsNat
     , squeezeUpdFrames      :: Bool
     , compact               :: Bool -- ^ True <=> "compact all the time"
     , compactThreshold      :: Double
@@ -311,7 +311,7 @@ getGCFlags = do
   ptr <- getGcFlagsPtr
   GCFlags <$> (peekFilePath =<< #{peek GC_FLAGS, statsFile} ptr)
           <*> (toEnum . fromIntegral <$>
-                (#{peek GC_FLAGS, giveStats} ptr :: IO Nat))
+                (#{peek GC_FLAGS, giveStats} ptr :: IO RtsNat))
           <*> #{peek GC_FLAGS, maxStkSize} ptr
           <*> #{peek GC_FLAGS, initialStkSize} ptr
           <*> #{peek GC_FLAGS, stkChunkSize} ptr
@@ -373,7 +373,7 @@ getCCFlags :: IO CCFlags
 getCCFlags = do
   ptr <- getCcFlagsPtr
   CCFlags <$> (toEnum . fromIntegral
-                <$> (#{peek COST_CENTRE_FLAGS, doCostCentres} ptr :: IO Nat))
+                <$> (#{peek COST_CENTRE_FLAGS, doCostCentres} ptr :: IO RtsNat))
           <*> #{peek COST_CENTRE_FLAGS, profilerTicks} ptr
           <*> #{peek COST_CENTRE_FLAGS, msecsPerTick} ptr