aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Inline and fix getGADTConTypeGVladislav Zavialov2020-12-292-36/+16
|/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The getGADTConTypeG used HsRecTy, which is at odds with GHC issue #18782. I noticed that getGADTConTypeG was only used in the Hoogle backend. Interestingly, when handling H98 constructors, Hoogle converts RecCon to PrefixCon (see Haddock.Backends.Hoogle.ppCtor). So I changed getGADTConTypeG to handle RecConGADT in the same manner as PrefixConGADT, and after this simplification moved it into the 'where' clause of ppCtor, to the only place where it is used. The practical effect of this change is as follows. Consider this example: data TestH98 = T98 { bar::Int } data TestGADT where TG :: { foo :: Int } -> TestGADT Before this patch, haddock --hoogle used to produce: T98 :: Int -> TestH98 [TG] :: {foo :: Int} -> TestGADT Notice how the record syntax was discarded in T98 but not TG. With this patch, we always produce signatures without record syntax: T98 :: Int -> TestH98 [TG] :: Int -> TestGADT I suspect this might also be a bugfix, as currently Hoogle doesn't seem to render GADT record constructors properly.
* / / / / / Adapt to changes to GlobalRdrElt and AvailInfoAdam Gundry2020-12-233-14/+6
|/ / / / / | | | | | | | | | | | | | | | Needed for ghc/ghc!4467
* | | | | Enable two warnings (#1245) (#1268)tomjaguarpaw2020-12-199-2/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | because they will be soon be added to -Wall. See https://gitlab.haskell.org/ghc/ghc/-/issues/15656
* | | | | Adapt to HsCoreTy (formerly NewHsTypeX) becoming a type synonymRyan Scott2020-12-165-5/+5
| | | | | | | | | | | | | | | | | | | | Needed for !4417, the fix for GHC#15706 and GHC#18914.
* | | | | Display linear/multiplicity arrows correctly (#1238)Krzysztof Gogolewski2020-12-169-7/+259
| | | | | | | | | | | | | | | | | | | | Previously we were ignoring multiplicity and displayed a %1 -> b as a -> b.
* | | | | Update output for nullary TyConApp optimisation (ghc/ghc!2952)Ben Gamari2020-12-161-105/+105
| | | | |
* | | | | Merge remote-tracking branch 'upstream/ghc-head' into ghc-headBen Gamari2020-12-158-10/+2
|\ \ \ \ \
| * | | | | Revert "Enable two warnings (#1245) (#1268)"Ben Gamari2020-12-158-10/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | As this does not build on GHC `master`. This reverts commit 7936692badfe38f23ae95b51fb7bd7c2ff7e9bce.
* | | | | | Revert "Update for boxed rep"Ben Gamari2020-12-152-6/+5
|/ / / / / | | | | | | | | | | | | | | | This reverts commit 4ffb30d8b637ccebecc81ce610f0af451ac8088d.
* | | | | Update for boxed repAndrew Martin2020-12-142-5/+6
| | | | |
* | | | | Enable two warnings (#1245) (#1268)tomjaguarpaw2020-12-108-2/+10
| | | | | | | | | | | | | | | | | | | | | | | | | because they will be soon be added to -Wall. See https://gitlab.haskell.org/ghc/ghc/-/issues/15656
* | | | | Merge pull request #1257 from AndreasPK/wip/andreask/opt_dumpsBen Gamari2020-12-031-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Update for changes in GHC's Pretty
| * | | | | Update for changes in GHC's PrettyAndreas Klebinger2020-11-241-1/+1
| | | | | |
* | | | | | Merge pull request #1258 from hsyl20/wip/hsyl20/hscenv/unitstateBen Gamari2020-11-305-33/+37
|\ \ \ \ \ \ | | | | | | | | | | | | | | Unit fields moved from DynFlags to HscEnv
| * | | | | | DynFlags's unit fields moved to HscEnvSylvain Henry2020-11-305-33/+37
|/ / / / / /
* | | | | | Add type arguments to PrefixConCale Gibbard2020-11-257-13/+13
| | | | | |
* | | | | | Avoid GHC#18932.Richard Eisenberg2020-11-251-1/+2
| | | | | |
* | | | | | Merge pull request #1253 from hsyl20/wip/hsyl20/plugins/hscenvBen Gamari2020-11-181-4/+5
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix after Plugins moved into HscEnv
| * | | | | Fix after Plugins moved into HscEnvSylvain Henry2020-11-161-4/+5
|/ / / / /
* | | | | Adapt to splitPiTysInvisible being renamed to splitInvisPiTysRyan Scott2020-11-131-1/+1
| | | | | | | | | | | | | | | | | | | | This is a part of !4434, a fix for GHC#18939.
* | | | | Adapt to HsOuterTyVarBndrsRyan Scott2020-10-3012-347/+488
| | | | | | | | | | | | | | | | | | | | | | | | | These changes accompany ghc/ghc!4107, which aims to be a fix for #16762.
* | | | | Adapt to HsConDecl{H98,GADT}Details splitRyan Scott2020-10-308-93/+124
| | | | | | | | | | | | | | | | | | | | Needed for GHC#18844.
* | | | | Adapt to the removal of Hs{Boxed,Constraint}TupleRyan Scott2020-10-292-3/+3
| | | | | | | | | | | | | | | | | | | | See ghc/ghc!4097 and GHC#18723.
* | | | | GHC.Driver.Types refactoring (#1242)Sylvain Henry2020-10-269-12/+20
| | | | |
* | | | | Match GHC, adding IsUnicodeSyntax field to HsFunTy and HsScaledAlan Zimmerman2020-10-196-14/+19
| | | | |
* | | | | Add whitespace in: map ($ v)Vladislav Zavialov2020-10-151-3/+3
| | | | |
* | | | | Changed tests due to unification of `Nat` and `Natural`HaskellMouse2020-10-131-12/+12
| | | | | | | | | | | | | | | | | | | | | | | | | in the follwing merge request: https://gitlab.haskell.org/ghc/ghc/-/merge_requests/3583
* | | | | Don't pass the HomeUnitId (#1239)Sylvain Henry2020-10-121-1/+0
| | | | |
* | | | | Adapt to GHC parser changesSylvain Henry2020-09-301-1/+2
| | | | |
* | | | | Update for parser (#1234)Sylvain Henry2020-09-293-7/+6
| | | | |
* | | | | Updates for the new linear types syntax: a %p -> bVladislav Zavialov2020-09-261-0/+1
| | | | |
* | | | | Update hypsrc-test for QuickLookBen Gamari2020-09-221-2/+2
| | | | | | | | | | | | | | | | | | | | This appears to be a spurious change.
* | | | | Bump base upper bound to 4.16Vladislav Zavialov2020-09-184-4/+4
| | | | |
* | | | | Bump GHC version to 9.1Ben Gamari2020-09-143-4/+4
| | | | |
* | | | | Merge pull request #1232 from haskell/wip/T18639-remove-generated-pragma,Alan Zimmerman2020-09-071-2/+0
|\ \ \ \ \ | | | | | | | | | | | | Match GHC for #18639, remove GENERATED pragma
| * | | | | Match GHC for #18639, remove GENERATED pragmaAlan Zimmerman2020-09-071-2/+0
| | | | | |
* | | | | | Merge pull request #1226 from hsyl20/wip/hsyl20/fs_ordBen Gamari2020-08-312-7/+13
|\| | | | | | | | | | | | | | | | | Remove Ord FastString instance
| * | | | | Remove Ord FastString instanceSylvain Henry2020-08-172-7/+13
|/ / / / /
* | | | | Merge pull request #1225 from hsyl20/wip/hsyl20/plugins/homeunitBen Gamari2020-08-123-4/+5
|\ \ \ \ \ | | | | | | | | | | | | Fix after HomeUnit
| * | | | | Fix after HomeUnitSylvain Henry2020-08-123-4/+5
|/ / / / /
* | | | | Merge pull request #1223 from hsyl20/wip/hsyl20/dynflags/exceptionBen Gamari2020-08-108-12/+20
|\ \ \ \ \ | | | | | | | | | | | | Fix after Outputable refactoring
| * | | | | Fix after Outputable refactoringSylvain Henry2020-08-058-12/+20
| | | | | |
* | | | | | Merge pull request #1200 from wz1000/wip/wz1000-modular-ping-pongBen Gamari2020-07-2311-65/+52
|\| | | | | | | | | | | | | | | | | Modular ping pong
| * | | | | Update for modular ping pongZubin Duggal2020-07-2311-65/+52
|/ / / / /
* | | | | Merge commit '904dce0cafe0a241dd3ef355775db47fc12f434d' into ghc-headBen Gamari2020-07-231-2/+0
|\ \ \ \ \
| * | | | | Rename hscTarget into backendSylvain Henry2020-07-201-3/+4
| |/ / / /
| * | | | Sync with GHC removing {-# CORE #-} pragmaKrzysztof Gogolewski2020-07-121-2/+0
| | | | | | | | | | | | | | | | | | | | See ghc ticket #18048
* | | | | Merge pull request #1214 from hsyl20/wip/hsyl20/hadrian/ncgBen Gamari2020-07-211-3/+4
|\ \ \ \ \ | | | | | | | | | | | | Rename hscTarget into backend
| * | | | | Rename hsctarget into backendSylvain Henry2020-07-021-3/+4
| | | | | |
* | | | | | Merge pull request #1209 from AndreasPK/wip/typed_uniqfmBen Gamari2020-07-091-7/+8
|\ \ \ \ \ \ | |/ / / / / |/| / / / / | |/ / / / Update for UniqFM changes.