From c9afe2216ccabd36e3083ec3b508310fcdb5eae3 Mon Sep 17 00:00:00 2001 From: M Farkas-Dyck Date: Sun, 5 Jun 2022 23:51:37 -0800 Subject: =?UTF-8?q?Clean=20up=20some.=20In=20particular:=20=E2=80=A2=20Del?= =?UTF-8?q?ete=20some=20dead=20code,=20largely=20under=20`GHC.Utils`.=20?= =?UTF-8?q?=E2=80=A2=20Clean=20up=20a=20few=20definitions=20in=20`GHC.Util?= =?UTF-8?q?s.(Misc,=20Monad)`.=20=E2=80=A2=20Clean=20up=20`GHC.Types.SrcLo?= =?UTF-8?q?c`.=20=E2=80=A2=20Derive=20stock=20`Functor,=20Foldable,=20Trav?= =?UTF-8?q?ersable`=20for=20more=20types.=20=E2=80=A2=20Derive=20more=20in?= =?UTF-8?q?stances=20for=20newtypes.?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Bump haddock submodule. --- ghc/GHCi/UI.hs | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'ghc') diff --git a/ghc/GHCi/UI.hs b/ghc/GHCi/UI.hs index 3751711b9d..3cf0c642c6 100644 --- a/ghc/GHCi/UI.hs +++ b/ghc/GHCi/UI.hs @@ -132,6 +132,7 @@ import qualified Data.IntMap.Strict as IntMap import Data.Time.LocalTime ( getZonedTime ) import Data.Time.Format ( formatTime, defaultTimeLocale ) import Data.Version ( showVersion ) +import qualified Data.Semigroup as S import Prelude hiding ((<>)) import GHC.Utils.Exception as Exception hiding (catch, mask, handle) @@ -1416,9 +1417,7 @@ printTypeOfNames names = mapM_ (printTypeOfName ) $ sortBy compareNames names compareNames :: Name -> Name -> Ordering -n1 `compareNames` n2 = - (compare `on` getOccString) n1 n2 `thenCmp` - (SrcLoc.leftmost_smallest `on` getSrcSpan) n1 n2 +compareNames = on compare getOccString S.<> on SrcLoc.leftmost_smallest getSrcSpan printTypeOfName :: GHC.GhcMonad m => Name -> m () printTypeOfName n @@ -3844,10 +3843,7 @@ enclosingTickSpan md (RealSrcSpan src _) = do where leftmostLargestRealSrcSpan :: RealSrcSpan -> RealSrcSpan -> Ordering -leftmostLargestRealSrcSpan a b = - (realSrcSpanStart a `compare` realSrcSpanStart b) - `thenCmp` - (realSrcSpanEnd b `compare` realSrcSpanEnd a) +leftmostLargestRealSrcSpan = on compare realSrcSpanStart S.<> on (flip compare) realSrcSpanEnd traceCmd :: GhciMonad m => String -> m () traceCmd arg -- cgit v1.2.1