Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC

Commits:

1 changed file:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -292,7 +292,7 @@ basicKnownKeyNames
    292 292
             fmapName,
    
    293 293
     
    
    294 294
             -- Monad stuff
    
    295
    -        thenIOName, bindIOName, returnIOName, failIOName, bindMName, thenMName,
    
    295
    +        thenIOName, bindIOName, returnIOName, bindMName, thenMName,
    
    296 296
             returnMName, joinMName,
    
    297 297
     
    
    298 298
             -- MonadFail
    
    ... ... @@ -1451,13 +1451,12 @@ ghciStepIoMName = varQual gHC_INTERNAL_GHCI (fsLit "ghciStepIO") ghciStepIoMClas
    1451 1451
     
    
    1452 1452
     -- IO things
    
    1453 1453
     ioTyConName, ioDataConName,
    
    1454
    -  thenIOName, bindIOName, returnIOName, failIOName :: Name
    
    1454
    +  thenIOName, bindIOName, returnIOName :: Name
    
    1455 1455
     ioTyConName       = tcQual  gHC_TYPES (fsLit "IO")       ioTyConKey
    
    1456 1456
     ioDataConName     = dcQual  gHC_TYPES (fsLit "IO")       ioDataConKey
    
    1457 1457
     thenIOName        = varQual gHC_INTERNAL_BASE  (fsLit "thenIO")   thenIOIdKey
    
    1458 1458
     bindIOName        = varQual gHC_INTERNAL_BASE  (fsLit "bindIO")   bindIOIdKey
    
    1459 1459
     returnIOName      = varQual gHC_INTERNAL_BASE  (fsLit "returnIO") returnIOIdKey
    
    1460
    -failIOName        = varQual gHC_INTERNAL_IO    (fsLit "failIO")   failIOIdKey
    
    1461 1460
     
    
    1462 1461
     -- IO things
    
    1463 1462
     printName :: Name
    
    ... ... @@ -2252,7 +2251,7 @@ cstringLengthIdKey = mkPreludeMiscIdUnique 28
    2252 2251
     
    
    2253 2252
     concatIdKey, filterIdKey, zipIdKey,
    
    2254 2253
         bindIOIdKey, returnIOIdKey, newStablePtrIdKey,
    
    2255
    -    printIdKey, failIOIdKey, nullAddrIdKey, voidArgIdKey,
    
    2254
    +    printIdKey, nullAddrIdKey, voidArgIdKey,
    
    2256 2255
         otherwiseIdKey, assertIdKey :: Unique
    
    2257 2256
     concatIdKey                   = mkPreludeMiscIdUnique 31
    
    2258 2257
     filterIdKey                   = mkPreludeMiscIdUnique 32
    
    ... ... @@ -2261,7 +2260,6 @@ bindIOIdKey = mkPreludeMiscIdUnique 34
    2261 2260
     returnIOIdKey                 = mkPreludeMiscIdUnique 35
    
    2262 2261
     newStablePtrIdKey             = mkPreludeMiscIdUnique 36
    
    2263 2262
     printIdKey                    = mkPreludeMiscIdUnique 37
    
    2264
    -failIOIdKey                   = mkPreludeMiscIdUnique 38
    
    2265 2263
     nullAddrIdKey                 = mkPreludeMiscIdUnique 39
    
    2266 2264
     voidArgIdKey                  = mkPreludeMiscIdUnique 40
    
    2267 2265
     otherwiseIdKey                = mkPreludeMiscIdUnique 43