diff options
| author | Ian Lynagh <igloo@earth.li> | 2010-02-20 17:09:42 +0000 |
|---|---|---|
| committer | Ian Lynagh <igloo@earth.li> | 2010-02-20 17:09:42 +0000 |
| commit | 1a7703d1cafd40e7284f8c28ce72fabf241beb95 (patch) | |
| tree | a301b3a79df0c703d50c26c66e94665ed40100ff /src/Haddock | |
| parent | 55e89ad9f09251e85fb49686521e024e77b04596 (diff) | |
Resolve conflicts
Diffstat (limited to 'src/Haddock')
| -rw-r--r-- | src/Haddock/Backends/Html.hs | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/src/Haddock/Backends/Html.hs b/src/Haddock/Backends/Html.hs index 371fb57c..b1290fd5 100644 --- a/src/Haddock/Backends/Html.hs +++ b/src/Haddock/Backends/Html.hs @@ -1609,12 +1609,10 @@ ppr_mono_ty _ (HsListTy ty) u = brackets (ppr_mono_lty pREC_TOP ty ppr_mono_ty _ (HsPArrTy ty) u = pabrackets (ppr_mono_lty pREC_TOP ty u) ppr_mono_ty _ (HsPredTy p) u = parens (ppPred u p) ppr_mono_ty _ (HsNumTy n) _ = toHtml (show n) -- generics only -ppr_mono_ty _ (HsSpliceTy _) _ = error "ppr_mono_ty HsSpliceTy" -ppr_mono_ty _ (HsSpliceTyOut _) _ = error "ppr_mono_ty HsSpliceTyOut" -#if __GLASGOW_HASKELL__ >= 611 +ppr_mono_ty _ (HsSpliceTy {}) _ = error "ppr_mono_ty HsSpliceTy" +ppr_mono_ty _ (HsQuasiQuoteTy {}) _ = error "ppr_mono_ty HsQuasiQuoteTy" ppr_mono_ty _ (HsRecTy _) _ = error "ppr_mono_ty HsRecTy" - ppr_mono_ty ctxt_prec (HsAppTy fun_ty arg_ty) unicode = maybeParen ctxt_prec pREC_CON $ hsep [ppr_mono_lty pREC_FUN fun_ty unicode, ppr_mono_lty pREC_CON arg_ty unicode] |