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

9 files changed, 31 insertions, 20 deletions

diff --git a/testsuite/tests/module/T21752.hs b/testsuite/tests/module/T21752.hs
new file mode 100644
index 0000000000..72fad0b26a
--- /dev/null
+++ b/testsuite/tests/module/T21752.hs
@@ -0,0 +1,12 @@
+{-# LANGUAGE DataKinds #-}
+module T21752 where
+
+import T21752A
+
+type T = TYPE
+
+type F m a b = FUN m a b
+
+type M = Many
+
+type O = One
diff --git a/testsuite/tests/module/T21752A.hs b/testsuite/tests/module/T21752A.hs
new file mode 100644
index 0000000000..2c4771a112
--- /dev/null
+++ b/testsuite/tests/module/T21752A.hs
@@ -0,0 +1,14 @@
+{-# LANGUAGE PolyKinds #-}
+{-# LANGUAGE DataKinds #-}
+module T21752A (
+    module GHC.Exts
+) where
+
+import GHC.Exts
+
+type T = TYPE
+
+type O = One
+type M = Many
+
+--type F = FUN
diff --git a/testsuite/tests/module/all.T b/testsuite/tests/module/all.T
index 212d9ecbb7..415f40717e 100644
--- a/testsuite/tests/module/all.T
+++ b/testsuite/tests/module/all.T
@@ -293,3 +293,5 @@ test('T13622', normal, compile, [''])
 test('T13704a', normal, compile, ['-main-is Main.program'])
 test('T13704b', [], multimod_compile, ['T13704b1.hs T13704b2.hs', '-main-is T13704b2.program -v0'])
 test('T20562', normal, compile, [''])
+
+test('T21752', [extra_files(['T21752A.hs', 'T21752.hs'])], multimod_compile, ['T21752', '-v0'])
diff --git a/testsuite/tests/rename/should_compile/T18302A.hs b/testsuite/tests/rename/should_compile/T18302A.hs
deleted file mode 100644
index 7df51aa3ea..0000000000
--- a/testsuite/tests/rename/should_compile/T18302A.hs
+++ /dev/null
@@ -1,4 +0,0 @@
-module T18302A ( module GHC.Prim ) where
-
-import GHC.Prim
-
diff --git a/testsuite/tests/rename/should_compile/T18302B.hs b/testsuite/tests/rename/should_compile/T18302B.hs
deleted file mode 100644
index 6c8075fa9f..0000000000
--- a/testsuite/tests/rename/should_compile/T18302B.hs
+++ /dev/null
@@ -1,8 +0,0 @@
--- | Check that TYPE and (->) are re-exportable.
-module T18302B where
-
-import T18302A
-
-type T = TYPE
-type F = (->)
-
diff --git a/testsuite/tests/rename/should_compile/all.T b/testsuite/tests/rename/should_compile/all.T
index ac660606ab..1c02db6e6e 100644
--- a/testsuite/tests/rename/should_compile/all.T
+++ b/testsuite/tests/rename/should_compile/all.T
@@ -176,7 +176,6 @@ test('T17832', [], multimod_compile, ['T17832M1', 'T17832M2'])
 test('T17837', normal, compile, [''])
 test('T18497', [], makefile_test, ['T18497'])
 test('T18264', [], makefile_test, ['T18264'])
-test('T18302', expect_broken(18302), compile, [''])
 test('T17853', [], multimod_compile, ['T17853', '-v0'])
 test('T19966', expect_broken(19966), compile, ['-fdefer-out-of-scope-variables'])
 test('T20472', normal, compile, [''])
diff --git a/testsuite/tests/simplCore/should_compile/T4201.stdout b/testsuite/tests/simplCore/should_compile/T4201.stdout
index baeee0b0af..920ae57662 100644
--- a/testsuite/tests/simplCore/should_compile/T4201.stdout
+++ b/testsuite/tests/simplCore/should_compile/T4201.stdout
@@ -1,4 +1,4 @@
-  lift :: Foo -> T
-  [HasNoCafRefs, TagSig: <TagProper>, LambdaFormInfo: LFReEntrant 1,
    Arity: 1, Strictness: <1!A>, CPR: 1,
-   Unfolding: (bof `cast` (Sym (N:Foo[0]) %<'Many>_N ->_R <T>_R))]
+   Unfolding: (bof
+                 `cast`
+               (Sym (N:Foo[0]) %<'GHC.Types.Many>_N ->_R <T>_R))]
diff --git a/testsuite/tests/typecheck/should_compile/holes.stderr b/testsuite/tests/typecheck/should_compile/holes.stderr
index cde126e969..dd5c497db2 100644
--- a/testsuite/tests/typecheck/should_compile/holes.stderr
+++ b/testsuite/tests/typecheck/should_compile/holes.stderr
@@ -52,8 +52,6 @@ holes.hs:11:15: warning: [-Wtyped-holes (in -Wdefault)]
         LT :: Ordering
         EQ :: Ordering
         GT :: Ordering
-        One :: GHC.Types.Multiplicity
-        Many :: GHC.Types.Multiplicity
         () :: ()
         lines :: String -> [String]
         unlines :: [String] -> String
diff --git a/testsuite/tests/typecheck/should_compile/holes3.stderr b/testsuite/tests/typecheck/should_compile/holes3.stderr
index 4dec2c57a5..c14e9e7b5c 100644
--- a/testsuite/tests/typecheck/should_compile/holes3.stderr
+++ b/testsuite/tests/typecheck/should_compile/holes3.stderr
@@ -55,8 +55,6 @@ holes3.hs:11:15: error:
         LT :: Ordering
         EQ :: Ordering
         GT :: Ordering
-        One :: GHC.Types.Multiplicity
-        Many :: GHC.Types.Multiplicity
         () :: ()
         lines :: String -> [String]
         unlines :: [String] -> String