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

Commits:

1 changed file:

Changes:

  • compiler/GHC/Builtin/Names.hs
    ... ... @@ -476,7 +476,6 @@ basicKnownKeyNames
    476 476
     
    
    477 477
             -- Generics
    
    478 478
             , genClassName, gen1ClassName
    
    479
    -        , datatypeClassName, constructorClassName, selectorClassName
    
    480 479
     
    
    481 480
             -- Monad comprehensions
    
    482 481
             , guardMName
    
    ... ... @@ -1480,15 +1479,10 @@ readClassName :: Name
    1480 1479
     readClassName   = clsQual gHC_INTERNAL_READ (fsLit "Read")      readClassKey
    
    1481 1480
     
    
    1482 1481
     -- Classes Generic and Generic1, Datatype, Constructor and Selector
    
    1483
    -genClassName, gen1ClassName, datatypeClassName, constructorClassName,
    
    1484
    -  selectorClassName :: Name
    
    1482
    +genClassName, gen1ClassName :: Name
    
    1485 1483
     genClassName  = clsQual gHC_INTERNAL_GENERICS (fsLit "Generic")  genClassKey
    
    1486 1484
     gen1ClassName = clsQual gHC_INTERNAL_GENERICS (fsLit "Generic1") gen1ClassKey
    
    1487 1485
     
    
    1488
    -datatypeClassName    = clsQual gHC_INTERNAL_GENERICS (fsLit "Datatype")    datatypeClassKey
    
    1489
    -constructorClassName = clsQual gHC_INTERNAL_GENERICS (fsLit "Constructor") constructorClassKey
    
    1490
    -selectorClassName    = clsQual gHC_INTERNAL_GENERICS (fsLit "Selector")    selectorClassKey
    
    1491
    -
    
    1492 1486
     genericClassNames :: [Name]
    
    1493 1487
     genericClassNames = [genClassName, gen1ClassName]
    
    1494 1488
     
    
    ... ... @@ -1739,15 +1733,10 @@ applicativeClassKey = mkPreludeClassUnique 34
    1739 1733
     foldableClassKey        = mkPreludeClassUnique 35
    
    1740 1734
     traversableClassKey     = mkPreludeClassUnique 36
    
    1741 1735
     
    
    1742
    -genClassKey, gen1ClassKey, datatypeClassKey, constructorClassKey,
    
    1743
    -  selectorClassKey :: Unique
    
    1736
    +genClassKey, gen1ClassKey :: Unique
    
    1744 1737
     genClassKey   = mkPreludeClassUnique 37
    
    1745 1738
     gen1ClassKey  = mkPreludeClassUnique 38
    
    1746 1739
     
    
    1747
    -datatypeClassKey    = mkPreludeClassUnique 39
    
    1748
    -constructorClassKey = mkPreludeClassUnique 40
    
    1749
    -selectorClassKey    = mkPreludeClassUnique 41
    
    1750
    -
    
    1751 1740
     -- KnownNat: see Note [KnownNat & KnownSymbol and EvLit] in GHC.Tc.Instance.Class
    
    1752 1741
     knownNatClassNameKey :: Unique
    
    1753 1742
     knownNatClassNameKey = mkPreludeClassUnique 42