Misc cleanup

* Include funTyCon in exposedPrimTyCons.
  Every single place using exposedPrimTyCons was adding funTyCon
  manually.
* Remove unused synTyConResKind and ieLWrappedName
* Add recordSelectorTyCon_maybe
* In exprType, panic instead of giving a trace message and dummy output.
  This prevents #18767 reoccurring.
* Fix compilation error in fragile concprog001 test (part of #18732)

6 files changed, 6 insertions, 6 deletions

diff --git a/testsuite/tests/concurrent/prog001/Arithmetic.hs b/testsuite/tests/concurrent/prog001/Arithmetic.hs
index 183b66c0ed..bce3ff6400 100644
--- a/testsuite/tests/concurrent/prog001/Arithmetic.hs
+++ b/testsuite/tests/concurrent/prog001/Arithmetic.hs
@@ -5,7 +5,7 @@ import Control.Concurrent.MVar
 import System.IO.Unsafe
 import Utilities
 import Converter
-import GHC.Data.Stream
+import Stream
 import Data.Ratio
 import Trit
 
diff --git a/testsuite/tests/concurrent/prog001/Converter.hs b/testsuite/tests/concurrent/prog001/Converter.hs
index ba4132dc43..cba86e0cfd 100644
--- a/testsuite/tests/concurrent/prog001/Converter.hs
+++ b/testsuite/tests/concurrent/prog001/Converter.hs
@@ -1,7 +1,7 @@
 
 module Converter (rationalToGray, grayToSignIO, signToGray, Gray, startF, startC) where
 
-import GHC.Data.Stream
+import Stream
 import Data.Ratio
 import Control.Concurrent
 import Control.Concurrent.MVar
diff --git a/testsuite/tests/concurrent/prog001/Thread.hs b/testsuite/tests/concurrent/prog001/Thread.hs
index 18799607a1..12886a8456 100644
--- a/testsuite/tests/concurrent/prog001/Thread.hs
+++ b/testsuite/tests/concurrent/prog001/Thread.hs
@@ -3,7 +3,7 @@ module Thread (threadTesting1) where
 
 import Control.Concurrent
 import Control.Concurrent.MVar
-import GHC.Data.Stream
+import Stream
 import Converter
 
 threadTesting1 :: Gray -> Gray -> IO Int
diff --git a/testsuite/tests/concurrent/prog001/Trit.hs b/testsuite/tests/concurrent/prog001/Trit.hs
index f81bc8bf21..8674d6510b 100644
--- a/testsuite/tests/concurrent/prog001/Trit.hs
+++ b/testsuite/tests/concurrent/prog001/Trit.hs
@@ -2,7 +2,7 @@ module Trit (Trit, rationalToTrit, getIntegral, getFraction, getFraction',
                 neg, addTrits, subTrits, shiftLeft, shiftRight, multiply
                 ) where
 
-import GHC.Data.Stream
+import Stream
 import Utilities
 import Data.Ratio
 
diff --git a/testsuite/tests/concurrent/prog001/Utilities.hs b/testsuite/tests/concurrent/prog001/Utilities.hs
index faa15d8f8c..0ebdb3db9c 100644
--- a/testsuite/tests/concurrent/prog001/Utilities.hs
+++ b/testsuite/tests/concurrent/prog001/Utilities.hs
@@ -1,6 +1,6 @@
 module Utilities (toBinary, fl) where
 
-import GHC.Data.Stream
+import Stream
 import Data.Ratio
 
 -- Convert from an Integer to its signed-digit representation
diff --git a/testsuite/tests/concurrent/prog001/all.T b/testsuite/tests/concurrent/prog001/all.T
index 0b73b3d5ad..39327b0a85 100644
--- a/testsuite/tests/concurrent/prog001/all.T
+++ b/testsuite/tests/concurrent/prog001/all.T
@@ -16,4 +16,4 @@ test('concprog001', [extra_files(['Arithmetic.hs', 'Converter.hs', 'Mult.hs', 'S
                      when(fast(), skip), only_ways(['threaded2']),
                      fragile(16604),
                      run_timeout_multiplier(2)],
-     multimod_compile_and_run, ['Mult', '-package ghc'])
+     multimod_compile_and_run, ['Mult', ''])