Cleanup BuiltInSyntax vs UserSyntax

There was some confusion about whether FUN/TYPE/One/Many should be
BuiltInSyntax or UserSyntax. The answer is certainly UserSyntax as
BuiltInSyntax is for things which are directly constructed by the parser
rather than going through normal renaming channels.

I fixed all the obviously wrong places I could find and added a test for
the original bug which was caused by this (#21752)

Fixes #21752 #20695 #18302

4 files changed, 0 insertions, 9 deletions

diff --git a/libraries/base/Data/Typeable/Internal.hs b/libraries/base/Data/Typeable/Internal.hs
index 2d2f735351..69530c911d 100644
--- a/libraries/base/Data/Typeable/Internal.hs
+++ b/libraries/base/Data/Typeable/Internal.hs
@@ -86,10 +86,8 @@ module Data.Typeable.Internal (
     trLiftedRep
   ) where
 
-import GHC.Prim ( FUN )
 import GHC.Base
 import qualified GHC.Arr as A
-import GHC.Types ( TYPE, Multiplicity (Many) )
 import Data.Type.Equality
 import GHC.List ( splitAt, foldl', elem )
 import GHC.Word
diff --git a/libraries/base/GHC/Exception.hs b/libraries/base/GHC/Exception.hs
index 1a3b039416..66982b0043 100644
--- a/libraries/base/GHC/Exception.hs
+++ b/libraries/base/GHC/Exception.hs
@@ -38,7 +38,6 @@ import GHC.Base
 import GHC.Show
 import GHC.Stack.Types
 import GHC.OldList
-import GHC.Prim
 import GHC.IO.Unsafe
 import {-# SOURCE #-} GHC.Stack.CCS
 import GHC.Exception.Type
diff --git a/libraries/base/GHC/Exts.hs b/libraries/base/GHC/Exts.hs
index 662bea8964..f5b2498542 100755
--- a/libraries/base/GHC/Exts.hs
+++ b/libraries/base/GHC/Exts.hs
@@ -25,10 +25,6 @@
 
 module GHC.Exts
        (
-        -- * Primitive types
-
-        FUN, TYPE, -- See https://gitlab.haskell.org/ghc/ghc/issues/18302
-
         -- ** Pointer types
         Ptr(..), FunPtr(..),
 
diff --git a/libraries/base/Unsafe/Coerce.hs b/libraries/base/Unsafe/Coerce.hs
index fd45217fef..76c010a0bf 100644
--- a/libraries/base/Unsafe/Coerce.hs
+++ b/libraries/base/Unsafe/Coerce.hs
@@ -22,8 +22,6 @@ module Unsafe.Coerce
 import GHC.Arr (amap) -- For amap/unsafeCoerce rule
 import GHC.Base
 
-import GHC.Types
-
 {- Note [Implementing unsafeCoerce]
 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
 The implementation of unsafeCoerce is surprisingly subtle.