diff options
| author | Austin Seipp <austin@well-typed.com> | 2014-04-22 06:09:40 -0500 |
|---|---|---|
| committer | Austin Seipp <austin@well-typed.com> | 2014-09-09 08:13:27 -0500 |
| commit | d94de87252d0fe2ae97341d186b03a2fbe136b04 (patch) | |
| tree | 1cac19f2786b1d8a1626886cd6373946a3a276b0 /compiler/main/DriverPipeline.hs | |
| parent | fdfe6c0e50001add357475a1a3a7627243a28a70 (diff) | |
| download | haskell-d94de87252d0fe2ae97341d186b03a2fbe136b04.tar.gz | |
Make Applicative a superclass of Monad
Summary:
This includes pretty much all the changes needed to make `Applicative`
a superclass of `Monad` finally. There's mostly reshuffling in the
interests of avoid orphans and boot files, but luckily we can resolve
all of them, pretty much. The only catch was that
Alternative/MonadPlus also had to go into Prelude to avoid this.
As a result, we must update the hsc2hs and haddock submodules.
Signed-off-by: Austin Seipp <austin@well-typed.com>
Test Plan: Build things, they might not explode horribly.
Reviewers: hvr, simonmar
Subscribers: simonmar
Differential Revision: https://phabricator.haskell.org/D13
Diffstat (limited to 'compiler/main/DriverPipeline.hs')
| -rw-r--r-- | compiler/main/DriverPipeline.hs | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/compiler/main/DriverPipeline.hs b/compiler/main/DriverPipeline.hs index 5a18e6e7bf..0e17793e07 100644 --- a/compiler/main/DriverPipeline.hs +++ b/compiler/main/DriverPipeline.hs @@ -1593,7 +1593,7 @@ mkExtraObjToLinkIntoBinary dflags = do where main - | gopt Opt_NoHsMain dflags = empty + | gopt Opt_NoHsMain dflags = Outputable.empty | otherwise = vcat [ ptext (sLit "#include \"Rts.h\""), ptext (sLit "extern StgClosure ZCMain_main_closure;"), @@ -1603,7 +1603,7 @@ mkExtraObjToLinkIntoBinary dflags = do ptext (sLit " __conf.rts_opts_enabled = ") <> text (show (rtsOptsEnabled dflags)) <> semi, case rtsOpts dflags of - Nothing -> empty + Nothing -> Outputable.empty Just opts -> ptext (sLit " __conf.rts_opts= ") <> text (show opts) <> semi, ptext (sLit " __conf.rts_hs_main = rtsTrue;"), @@ -1639,7 +1639,7 @@ mkNoteObjsToLinkIntoBinary dflags dep_packages = do -- where we need to do this. (if platformHasGnuNonexecStack (targetPlatform dflags) then text ".section .note.GNU-stack,\"\",@progbits\n" - else empty) + else Outputable.empty) ] where |