aboutsummaryrefslogtreecommitdiff
Commit message (Collapse)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'origin/ghc-head' into HEADBen Gamari2021-03-06305-1413/+2435
|\
| * Merge pull request #1351 from hsyl20/wip/hsyl20/fix-headHécate Moonlight2021-02-242-18/+18
| |\ | | | | | | Fix haddockHypsrcTest output in ghc-head
| | * Fix haddockHypsrcTest output in ghc-headSylvain Henry2021-02-242-18/+18
| |/
| * Merge pull request #1349 from Kleidukos/fix-interface-guesstarget-callHécate Moonlight2021-02-231-2/+2
| |\ | | | | | | Fix the call-site of guessTarget in Interface.hs
| | * Fix the call-site of guessTarget in Interface.hsHécate Moonlight2021-02-231-2/+2
| |/ | | | | | | Explicit the imports from GHC.HsToCore.Docs
| * Merge pull request #1348 from Kleidukos/head/explicit-imports-interfaceHécate Moonlight2021-02-222-47/+50
| |\ | | | | | | Explicit imports for Haddock.Interface and Haddock.Interface.Create
| | * Explicit imports for Haddock.Interface and Haddock.Interface.CreateHécate Moonlight2021-02-222-47/+50
| |/
| * Merge pull request #1345 from Kleidukos/head/fix-interface-importsHécate Moonlight2021-02-222-33/+41
| |\ | | | | | | [ghc-head] Clean-up of Interface and Interface.Create's imports and pragmata
| | * Clean-up of Interface and Interface.Create's imports and pragmataHécate Moonlight2021-02-222-33/+41
| |/
| * Merge pull request #1342 from nomeata/joachim/haskell2010-in-tests-ghc-headHécate Moonlight2021-02-22300-378/+1374
| |\ | | | | | | html-test: Always set language
| | * html-test: Always set languageJoachim Breitner2021-02-22300-378/+1374
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | from ghc-9.2 on, the “default” langauge of GHC is expected to change more wildly. To prepare for that (and unblock https://gitlab.haskell.org/ghc/ghc/-/merge_requests/4853), this sets the language for all the test files to `Haskell2010`. This should insolate this test suite against changes to the default. Cherry-picked from https://github.com/haskell/haddock/pull/1341
| * | Merge pull request #1311 from fendor/wip/add-targetUnitId-to-targetHécate Moonlight2021-02-211-1/+1
| |\ \ | | | | | | | | Add UnitId to Target record
| | * | Add UnitId to Target recordFendor2021-02-091-1/+1
| | |/
| * | Merge pull request #1331 from phadej/more-explicit-data-list-importsHécate Moonlight2021-02-142-1/+2
| |\ \ | | | | | | | | Add import list to Data.List in Haddock.Interface.Create
| | * | Add import list to Data.List in Haddock.Interface.CreateOleg Grenrus2021-02-142-1/+2
| |/ /
| * | Merge pull request #1329 from hsyl20/hsyl20/stabe_ifaceHécate Moonlight2021-02-1113-984/+998
| |\ \ | | |/ | |/| Stable sort for instances
| | * Also make TyLit deterministicalexbiehl2021-02-111-2/+7
| | |
| | * Stable sort for (data/newtype) instancesalexbiehl2021-02-1113-982/+991
| | |
* | | Add ITproj to parserShayne Fletcher2021-03-061-0/+1
| | |
* | | Context becomes a Maybe in the GHC ASTAlan Zimmerman2021-02-228-34/+49
|/ / | | | | | | | | | | This prevents noLoc's appearing in the ParsedSource. Match the change in GHC.
* | Merge pull request #1327 from hsyl20/wip/hsyl20/logger2Hécate Moonlight2021-02-093-4/+3
|\ \ | | | | | | Fix to build with HEAD
| * | Fix to build with HEADSylvain Henry2021-02-093-4/+3
|/ /
* | Merge remote-tracking branch 'upstream/ghc-head' into ghc-headBen Gamari2021-02-0828-185/+337
|\ \
| * \ Merge pull request #1310 from hsyl20/wip/hsyl20/logger2Alexander Biehl2021-02-083-26/+31
| |\ \ | | | | | | | | Logger refactoring
| | * | Update for LoggerSylvain Henry2021-02-083-26/+31
| | |/
| * | Merge pull request #1321 from Kleidukos/ghc-9.0Hécate Moonlight2021-02-0726-159/+306
| |\ \ | | | | | | | | Merge ghc-9.0 into ghc-head
| | * \ Merge branch 'ghc-head' into ghc-9.0alexbiehl-gc2021-02-0750-1442/+1900
| | |\ \ | | |/ / | |/| |
| * | | Merge pull request #1317 from bgamari/wip/ghc-head-mergealexbiehl-gc2021-02-07262-2330/+9838
| |\ \ \ | | | |/ | | |/| Merge ghc-8.10 into ghc-head
| | | * Merge pull request #1322 from haskell/alex/forward-portalexbiehl-gc2021-02-071-2/+1
| | | |\ | | | | | | | | | | simplify calculating percentages fixing #1194 (#1236)
| | | | * simplify calculating percentages fixing #1194 (#1236)Willem Van Onsem2021-02-071-2/+1
| | | |/
| | | * Merge pull request #1318 from MorrowM/ghc-9.0Hécate Moonlight2021-02-071-1/+0
| | | |\ | | | | | | | | | | Fix search div not scrolling
| | | | * Fix search div not scrollingMorrowM2021-02-071-1/+0
| | | | |
| | | * | Merge pull request #1320 from haskell/alex/fixHécate Moonlight2021-02-072-8/+4
| | | |\ \ | | | | | | | | | | | | Remove dubious parseModLink
| | | | * | Remove dubious parseModLinkalexbiehl2021-02-072-8/+4
| | | |/ / | | | | | | | | | | | | | | | Instead construct the ModLink value directly when parsing.
| | | * | Merge pull request #1314 from tweag/show-linear-backportHécate Moonlight2021-02-079-7/+259
| | | |\ \ | | | | | | | | | | | | Backport #1238 (linear types) to ghc-9.0
| | | | * | Display linear/multiplicity arrows correctly (#1238)Krzysztof Gogolewski2021-02-059-7/+259
| | | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we were ignoring multiplicity and displayed a %1 -> b as a -> b. (cherry picked from commit b4b4d896d2d68d6c48e7db7bfe95c185ca0709cb)
| | | * | Merge pull request #1319 from alexbiehl/alex/compatHécate Moonlight2021-02-0714-49/+198
| | | |\ \ | | | | |/ | | | |/| Backward compat: Add support for labeled module references
| | | | * Add support for labeled module referencesIñaki García Etxebarria2021-02-0714-49/+198
| | | |/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Support a markdown-style way of annotating module references. For instance -- | [label]("Module.Name#anchor") will create a link that points to the same place as the module reference "Module.Name#anchor" but the text displayed on the link will be "label".
| | | * Merge pull request #1313 from Kleidukos/amend-contributingHécate Moonlight2021-02-052-19/+16
| | | |\ | | | | | | | | | | Amend the CONTRIBUTING.md file
| | | | * Amend the CONTRIBUTING.md fileHécate Moonlight2021-02-052-19/+16
| | | |/
| | | * Merge pull request #1312 from Kleidukos/proper-branch-etiquetteHécate Moonlight2021-02-052-55/+65
| | | |\ | | | | | | | | | | Add a CONTRIBUTING.md file
| | | | * Add a CONTRIBUTING.md fileHécate Moonlight2021-02-052-55/+65
| | | |/
| | | * Cleanup: fix build warningsVladislav Zavialov2021-02-056-7/+7
| | | |
| | | * Merge pull request #1296 from Kleidukos/ghc-9.0Hécate Moonlight2021-02-054-33/+31
| | | |\ | | | | | | | | | | Merge the late additions to ghc-8.10 into ghc-9.0
| | | | * Update cabal.project and README build instructionsVladislav Zavialov2021-02-052-20/+13
| | | | |
| | | | * Move CI to ghc-9.0Hécate Moonlight2021-02-052-13/+18
| | | |/
| | | * Add import list to Data.ListOleg Grenrus2021-01-241-1/+1
| | | |
* | | | Merge branch 'wip/ghc-head-merge' into ghc-headBen Gamari2021-02-06262-2330/+9838
|\ \ \ \ | |/ / / |/| / / | |/ /
| * | Merge commit '41964cb2fd54b5a10f8c0f28147015b7d5ad2c02' into wip/ghc-head-mergeBen Gamari2021-02-063-0/+3
| |\ \
| * \ \ Merge commit 'a917dfd29f3103b69378138477514cbfa38558a9' into wip/ghc-head-mergeBen Gamari2021-02-060-0/+0
| |\ \ \
generated by cgit v1.2.3 (git 2.39.1) at 2024-11-24 14:25:58 +0000