[Git][ghc/ghc][wip/andreask/ppr_prelude] Remove Name.Type module

[Andreas Klebinger (@AndreasK)]

Andreas Klebinger pushed to branch wip/andreask/ppr_prelude at Glasgow Haskell Compiler / GHC


Commits:
0bfb7ba0 by Andreas Klebinger at 2022-11-02T16:11:21+01:00
Remove Name.Type module

- - - - -


4 changed files:

- compiler/GHC/Unit/Types.hs
- compiler/Language/Haskell/Syntax/Module/Name.hs
- − compiler/Language/Haskell/Syntax/Module/Name/Type.hs
- compiler/ghc.cabal.in


Changes:

=====================================
compiler/GHC/Unit/Types.hs
=====================================
@@ -89,7 +89,6 @@ module GHC.Unit.Types
 where
 
 import GHC.Prelude
--- import Prelude hiding ((<>))
 
 import GHC.Types.Unique
 import GHC.Types.Unique.DSet


=====================================
compiler/Language/Haskell/Syntax/Module/Name.hs
=====================================
@@ -1,17 +1,7 @@
-{-# LANGUAGE StandaloneDeriving #-}
-
--- See Note [Exporting pprTrace from GHC.Prelude]
-{-# OPTIONS_GHC -Wno-orphans #-}
-
-module Language.Haskell.Syntax.Module.Name
-  ( module Language.Haskell.Syntax.Module.Name
-  ) where
+module Language.Haskell.Syntax.Module.Name where
 
 import Prelude
 
--- See Note [Exporting pprTrace from GHC.Prelude]
-import Language.Haskell.Syntax.Module.Name.Type as Language.Haskell.Syntax.Module.Name
-
 import Data.Data
 import Data.Char (isAlphaNum)
 import Control.DeepSeq
@@ -21,7 +11,8 @@ import System.FilePath
 import GHC.Utils.Misc (abstractConstr)
 import GHC.Data.FastString
 
-deriving instance Show ModuleName
+-- | A ModuleName is essentially a simple string, e.g. @Data.List at .
+newtype ModuleName = ModuleName FastString deriving (Show, Eq)
 
 instance Ord ModuleName where
   nm1 `compare` nm2 = stableModuleNameCmp nm1 nm2


=====================================
compiler/Language/Haskell/Syntax/Module/Name/Type.hs deleted
=====================================
@@ -1,8 +0,0 @@
-module Language.Haskell.Syntax.Module.Name.Type where
-
-import Prelude
-
-import GHC.Data.FastString ( FastString )
-
--- | A ModuleName is essentially a simple string, e.g. @Data.List at .
-newtype ModuleName = ModuleName FastString deriving (Eq)
\ No newline at end of file


=====================================
compiler/ghc.cabal.in
=====================================
@@ -819,7 +819,6 @@ Library
         Language.Haskell.Syntax.ImpExp
         Language.Haskell.Syntax.Lit
         Language.Haskell.Syntax.Module.Name
-        Language.Haskell.Syntax.Module.Name.Type
         Language.Haskell.Syntax.Pat
         Language.Haskell.Syntax.Type
 



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0bfb7ba063c7d012a63c3449194f9866fc1375fe

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0bfb7ba063c7d012a63c3449194f9866fc1375fe
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20221102/34f6c021/attachment-0001.html>