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

Commits:

1 changed file:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -467,7 +467,6 @@ basicKnownKeyNames
    467 467
     
    
    468 468
             -- Monad comprehensions
    
    469 469
             , guardMName
    
    470
    -        , liftMName
    
    471 470
             , mzipName
    
    472 471
     
    
    473 472
             -- GHCi Sandbox
    
    ... ... @@ -1501,9 +1500,8 @@ choiceAName = varQual gHC_INTERNAL_ARROW (fsLit "|||") choiceAIdKey
    1501 1500
     loopAName          = varQual gHC_INTERNAL_ARROW (fsLit "loop")      loopAIdKey
    
    1502 1501
     
    
    1503 1502
     -- Monad comprehensions
    
    1504
    -guardMName, liftMName, mzipName :: Name
    
    1503
    +guardMName, mzipName :: Name
    
    1505 1504
     guardMName         = varQual gHC_INTERNAL_MONAD (fsLit "guard")    guardMIdKey
    
    1506
    -liftMName          = varQual gHC_INTERNAL_MONAD (fsLit "liftM")    liftMIdKey
    
    1507 1505
     mzipName           = varQual gHC_INTERNAL_CONTROL_MONAD_ZIP (fsLit "mzip") mzipIdKey
    
    1508 1506
     
    
    1509 1507
     
    
    ... ... @@ -2378,9 +2376,8 @@ toIntegerClassOpKey = mkPreludeMiscIdUnique 192
    2378 2376
     toRationalClassOpKey = mkPreludeMiscIdUnique 193
    
    2379 2377
     
    
    2380 2378
     -- Monad comprehensions
    
    2381
    -guardMIdKey, liftMIdKey, mzipIdKey :: Unique
    
    2379
    +guardMIdKey, mzipIdKey :: Unique
    
    2382 2380
     guardMIdKey     = mkPreludeMiscIdUnique 194
    
    2383
    -liftMIdKey      = mkPreludeMiscIdUnique 195
    
    2384 2381
     mzipIdKey       = mkPreludeMiscIdUnique 196
    
    2385 2382
     
    
    2386 2383
     -- GHCi