diff options
| author | M Farkas-Dyck <strake888@proton.me> | 2022-06-05 23:51:37 -0800 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2022-09-17 06:44:47 -0400 |
| commit | c9afe2216ccabd36e3083ec3b508310fcdb5eae3 (patch) | |
| tree | 4d944f6afd24e20d3698e20b3a348cd2064b3919 /compiler/GHC/Unit/Module | |
| parent | 5031bf49793f3470a9fd9036829a08e556584d8a (diff) | |
| download | haskell-c9afe2216ccabd36e3083ec3b508310fcdb5eae3.tar.gz | |
Clean up some. In particular:
• Delete some dead code, largely under `GHC.Utils`.
• Clean up a few definitions in `GHC.Utils.(Misc, Monad)`.
• Clean up `GHC.Types.SrcLoc`.
• Derive stock `Functor, Foldable, Traversable` for more types.
• Derive more instances for newtypes.
Bump haddock submodule.
Diffstat (limited to 'compiler/GHC/Unit/Module')
| -rw-r--r-- | compiler/GHC/Unit/Module/Env.hs | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/compiler/GHC/Unit/Module/Env.hs b/compiler/GHC/Unit/Module/Env.hs index 2fc0f9e9c1..0c0559e206 100644 --- a/compiler/GHC/Unit/Module/Env.hs +++ b/compiler/GHC/Unit/Module/Env.hs @@ -41,7 +41,6 @@ import GHC.Types.Unique import GHC.Types.Unique.FM import GHC.Types.Unique.DFM import GHC.Unit.Types -import GHC.Utils.Misc import Data.List (sortBy, sort) import Data.Ord @@ -50,6 +49,7 @@ import Data.Map (Map) import Data.Set (Set) import qualified Data.Map as Map import qualified Data.Set as Set +import qualified Data.Semigroup as S import qualified GHC.Data.FiniteMap as Map import GHC.Utils.Outputable @@ -87,7 +87,7 @@ instance Outputable NDModule where instance Ord NDModule where compare (NDModule (Module p1 n1)) (NDModule (Module p2 n2)) = - (getUnique p1 `nonDetCmpUnique` getUnique p2) `thenCmp` + (getUnique p1 `nonDetCmpUnique` getUnique p2) S.<> (getUnique n1 `nonDetCmpUnique` getUnique n2) filterModuleEnv :: (Module -> a -> Bool) -> ModuleEnv a -> ModuleEnv a |