Marge Bot pushed to branch master at Glasgow Haskell Compiler / GHC Commits: 87f510a5 by Simon Hengel at 2026-06-09T18:03:25-04:00 Don't use non-breaking spaces - - - - - 7 changed files: - compiler/GHC/Driver/Backend.hs - compiler/GHC/Parser/PostProcess/Haddock.hs - compiler/GHC/Runtime/Debugger/Breakpoints.hs - compiler/GHC/Runtime/Eval/Types.hs - compiler/GHC/Runtime/Heap/Inspect.hs - compiler/GHC/Utils/Logger.hs - libraries/ghc-internal/src/GHC/Internal/Lexeme.hs Changes: ===================================== compiler/GHC/Driver/Backend.hs ===================================== @@ -184,7 +184,7 @@ import GHC.Platform -- about enumerating them. Just one set of error messages has been -- ported to have an open-world assumption: these are the error -- messages associated with type checking of foreign imports and --- exports. To allow other errors to be issued with an open-world +-- exports. To allow other errors to be issued with an open-world -- assumption, use functions `backendValidityOfCImport` and -- `backendValidityOfCExport` as models, and have a look at how the -- 'expected back ends' are used in modules "GHC.Tc.Gen.Foreign" and @@ -225,11 +225,11 @@ platformJSSupported platform | otherwise = False --- | A value of type @Backend@ represents one of GHC's back ends. +-- | A value of type @Backend@ represents one of GHC's back ends. -- The set of back ends cannot be extended except by modifying the -- definition of @Backend@ in this module. -- --- The @Backend@ type is abstract; that is, its value constructors are +-- The @Backend@ type is abstract; that is, its value constructors are -- not exported. It's crucial that they not be exported, because a -- value of type @Backend@ carries only the back end's /name/, not its -- behavior or properties. If @Backend@ were not abstract, then code ===================================== compiler/GHC/Parser/PostProcess/Haddock.hs ===================================== @@ -289,7 +289,7 @@ instance HasHaddock (Located (HsModule GhcPs)) where pure $ L l_mod $ mod { hsmodExports = hsmodExports' , hsmodDecls = hsmodDecls' - , hsmodExt = (hsmodExt mod) { hsmodHaddockModHeader = headerDocs } } + , hsmodExt = (hsmodExt mod) { hsmodHaddockModHeader = headerDocs } } lexHsDocString :: HsDocString -> HsDoc GhcPs lexHsDocString = lexHsDoc parseIdentifier ===================================== compiler/GHC/Runtime/Debugger/Breakpoints.hs ===================================== @@ -177,7 +177,7 @@ resolveFunctionBreakpoint inp = do -- for -- (a) this binder only (it maybe a top-level or a nested declaration) -- (b) that do not have an enclosing breakpoint -findBreakForBind :: String {-^ Name of bind to break at -} -> ModBreaks -> [(BreakTickIndex, RealSrcSpan)] +findBreakForBind :: String {-^ Name of bind to break at -} -> ModBreaks -> [(BreakTickIndex, RealSrcSpan)] findBreakForBind str_name modbreaks = filter (not . enclosed) ticks where ticks = [ (index, span) @@ -226,7 +226,7 @@ getModBreak m = do -- source breakpoint, it means all *ocurrences* of that breakpoint across -- modules should be stopped at -- hence we keep a trie from BreakpointId to -- the list of internal break ids using it. --- See also Note [Breakpoint identifiers] +-- See also Note [Breakpoint identifiers] type BreakpointOccurrences = ModuleEnv (IntMap.IntMap [InternalBreakpointId]) -- | Lookup all InternalBreakpointIds matching the given BreakpointId ===================================== compiler/GHC/Runtime/Eval/Types.hs ===================================== @@ -75,7 +75,7 @@ enableGhcStepMode _ = EvalStepSingle -- and the SrcSpan of a breakpoint we hit, return @True@ if we should stop at -- this breakpoint. -- --- In particular, this will always be @False@ for @'RunToCompletion'@ and +-- In particular, this will always be @False@ for @'RunToCompletion'@ and -- @'RunAndLogSteps'@. We'd need further information e.g. about the user -- breakpoints to determine whether to break in those modes. breakHere :: Bool -- ^ Was this breakpoint explicitly active (in the @BreakArray@s)? ===================================== compiler/GHC/Runtime/Heap/Inspect.hs ===================================== @@ -293,22 +293,22 @@ ppr_termM1 Prim{valRaw=words, ty=ty} = return $ repPrim (tyConAppTyCon ty) words ppr_termM1 Suspension{ty=ty, bound_to=Nothing, infoprov=mipe} = return $ hcat $ -    [ char '_' -    , whenPprDebug $ + [ char '_' + , whenPprDebug $ space <> dcolon <> pprSigmaType ty -    ] ++ -    [ whenPprDebug $ + ] ++ + [ whenPprDebug $ space <> char '<' <> text (ipSrcFile ipe) <> char ':' <> text (ipSrcSpan ipe) <> char '>' -    | Just ipe <- [mipe] + | Just ipe <- [mipe] , not $ null $ ipSrcFile ipe -    ] + ] ppr_termM1 Suspension{ty=ty, bound_to=Just n} | otherwise = return$ parens$ ppr n <> dcolon <> pprSigmaType ty ppr_termM1 Term{} = panic "ppr_termM1 - Term" ===================================== compiler/GHC/Utils/Logger.hs ===================================== @@ -413,7 +413,7 @@ defaultLogAction = defaultLogActionWithHandles stdout stderr -- | The default 'LogAction' parametrized over the standard output and standard error handles. -- Allows clients to replicate the log message formatting of GHC with custom handles. -defaultLogActionWithHandles :: Handle {-^ Handle for standard output -} -> Handle {-^ Handle for standard errors -} -> LogAction +defaultLogActionWithHandles :: Handle {-^ Handle for standard output -} -> Handle {-^ Handle for standard errors -} -> LogAction defaultLogActionWithHandles out err logflags msg_class srcSpan msg | log_dopt Opt_D_dump_json logflags = jsonLogActionWithHandle out logflags msg_class srcSpan msg | otherwise = case msg_class of ===================================== libraries/ghc-internal/src/GHC/Internal/Lexeme.hs ===================================== @@ -44,7 +44,7 @@ okSymChar c _ -> False startsVarSym, startsVarId, startsConSym, startsConId :: Char -> Bool -startsVarSym c = okSymChar c && c /= ':' -- Infix Ids +startsVarSym c = okSymChar c && c /= ':' -- Infix Ids startsConSym c = c == ':' -- Infix data constructors startsVarId c = c == '_' || case generalCategory c of -- Ordinary Ids LowercaseLetter -> True View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/87f510a5ee1f7f08baceebfcd79c3e32... -- View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/87f510a5ee1f7f08baceebfcd79c3e32... You're receiving this email because of your account on gitlab.haskell.org.