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/Iface | |
| 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/Iface')
| -rw-r--r-- | compiler/GHC/Iface/Ext/Ast.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Iface/Ext/Types.hs | 6 | ||||
| -rw-r--r-- | compiler/GHC/Iface/Make.hs | 2 | ||||
| -rw-r--r-- | compiler/GHC/Iface/Recomp.hs | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/compiler/GHC/Iface/Ext/Ast.hs b/compiler/GHC/Iface/Ext/Ast.hs index 64eac53af0..de66cdaef2 100644 --- a/compiler/GHC/Iface/Ext/Ast.hs +++ b/compiler/GHC/Iface/Ext/Ast.hs @@ -944,7 +944,7 @@ instance HiePass p => ToHie (HsMatchContext (GhcPass p)) where name' :: LocatedN Name name' = case hiePass @p of HieRn -> name - HieTc -> mapLoc varName name + HieTc -> fmap varName name toHie (StmtCtxt a) = toHie a toHie _ = pure [] diff --git a/compiler/GHC/Iface/Ext/Types.hs b/compiler/GHC/Iface/Ext/Types.hs index 674741bfd0..08412349d2 100644 --- a/compiler/GHC/Iface/Ext/Types.hs +++ b/compiler/GHC/Iface/Ext/Types.hs @@ -28,7 +28,6 @@ import GHC.Types.SrcLoc import GHC.Types.Avail import GHC.Types.Unique import qualified GHC.Utils.Outputable as O ( (<>) ) -import GHC.Utils.Misc import GHC.Utils.Panic import qualified Data.Array as A @@ -41,6 +40,7 @@ import Data.Word ( Word8 ) import Control.Applicative ( (<|>) ) import Data.Coerce ( coerce ) import Data.Function ( on ) +import qualified Data.Semigroup as S type Span = RealSrcSpan @@ -751,9 +751,9 @@ data HieName deriving (Eq) instance Ord HieName where - compare (ExternalName a b c) (ExternalName d e f) = compare (a,b) (d,e) `thenCmp` leftmost_smallest c f + compare (ExternalName a b c) (ExternalName d e f) = compare (a,b) (d,e) S.<> leftmost_smallest c f -- TODO (int-index): Perhaps use RealSrcSpan in HieName? - compare (LocalName a b) (LocalName c d) = compare a c `thenCmp` leftmost_smallest b d + compare (LocalName a b) (LocalName c d) = compare a c S.<> leftmost_smallest b d -- TODO (int-index): Perhaps use RealSrcSpan in HieName? compare (KnownKeyName a) (KnownKeyName b) = nonDetCmpUnique a b -- Not actually non deterministic as it is a KnownKey diff --git a/compiler/GHC/Iface/Make.hs b/compiler/GHC/Iface/Make.hs index 5db10d502b..fde785284a 100644 --- a/compiler/GHC/Iface/Make.hs +++ b/compiler/GHC/Iface/Make.hs @@ -77,7 +77,7 @@ import GHC.Types.CompleteMatch import GHC.Utils.Outputable import GHC.Utils.Panic import GHC.Utils.Panic.Plain -import GHC.Utils.Misc hiding ( eqListBy ) +import GHC.Utils.Misc import GHC.Utils.Logger import GHC.Utils.Trace diff --git a/compiler/GHC/Iface/Recomp.hs b/compiler/GHC/Iface/Recomp.hs index 64fff6cdc1..f4fac35375 100644 --- a/compiler/GHC/Iface/Recomp.hs +++ b/compiler/GHC/Iface/Recomp.hs @@ -44,7 +44,7 @@ import GHC.Utils.Error import GHC.Utils.Panic import GHC.Utils.Panic.Plain import GHC.Utils.Outputable as Outputable -import GHC.Utils.Misc as Utils hiding ( eqListBy ) +import GHC.Utils.Misc as Utils import GHC.Utils.Binary import GHC.Utils.Fingerprint import GHC.Utils.Exception |