[commit: ghc] master: Narrow scope of special-case for unqualified printing of names in core libraries (e2c9173)

Tue Dec 15 20:06:22 UTC 2015

Repository : ssh://git@git.haskell.org/ghc

On branch  : master
Link       : http://ghc.haskell.org/trac/ghc/changeset/e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f/ghc

>---------------------------------------------------------------

commit e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f
Author: Ben Gamari <bgamari.foss at gmail.com>
Date:   Tue Dec 15 16:08:52 2015 +0100

    Narrow scope of special-case for unqualified printing of names in core libraries

    Commit 547c597112954353cef7157cb0a389bc4f6303eb modifies the
    pretty-printer to render names from a set of core packages (`base`,
    `ghc-prim`, `template-haskell`) as unqualified. The idea here was that
    many of these names typically are not in scope but are well-known by the
    user and therefore qualification merely introduces noise.

    This, however, is a very large hammer and potentially breaks any
    consumer who relies on parsing GHC output (hence #11208). This commit
    partially reverts this change, now only printing `Constraint` (which
    appears quite often in errors) as unqualified.

    Fixes #11208.

    Updates tests in `array` submodule.

    Test Plan: validate

    Reviewers: hvr, thomie, austin

    Subscribers: thomie

    Differential Revision: https://phabricator.haskell.org/D1619

    GHC Trac Issues: #11208

>---------------------------------------------------------------

e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f
 compiler/main/HscTypes.hs                          |  42 ++++---
 compiler/prelude/TysWiredIn.hs                     |   3 +-
 libraries/array                                    |   2 +-
 .../tests/annotations/should_fail/annfail05.stderr |   7 +-
 .../tests/annotations/should_fail/annfail08.stderr |  13 ++-
 .../tests/annotations/should_fail/annfail10.stderr |  49 ++++----
 .../tests/deSugar/should_compile/T2431.stderr      |  33 +++---
 testsuite/tests/deriving/should_fail/T4846.stderr  |  19 ++--
 testsuite/tests/ghc-api/annotations/T10268.stderr  |   3 +-
 .../tests/ghci.debugger/scripts/break006.stderr    |  56 +++++----
 .../tests/ghci.debugger/scripts/break024.stdout    |   9 +-
 .../tests/ghci.debugger/scripts/print019.stderr    |  23 ++--
 .../tests/ghci.debugger/scripts/print028.stdout    |   7 +-
 .../tests/ghci.debugger/scripts/print033.stdout    |   3 +-
 testsuite/tests/ghci/scripts/T11208.hs             |   8 ++
 testsuite/tests/ghci/scripts/T11208.script         |   2 +
 testsuite/tests/ghci/scripts/T11208.stdout         |   2 +
 testsuite/tests/ghci/scripts/T2182ghci2.stderr     |  14 ++-
 testsuite/tests/ghci/scripts/T7873.stdout          |   4 +-
 testsuite/tests/ghci/scripts/T8469.stdout          |   2 +-
 testsuite/tests/ghci/scripts/T8959.stdout          |   8 +-
 testsuite/tests/ghci/scripts/T9181.stdout          | 105 ++++++++++-------
 testsuite/tests/ghci/scripts/T9881.stdout          |   3 +-
 testsuite/tests/ghci/scripts/ghci008.stdout        |  12 +-
 testsuite/tests/ghci/scripts/ghci013.stdout        |   3 +-
 testsuite/tests/ghci/scripts/ghci019.stderr        |   8 +-
 testsuite/tests/ghci/scripts/ghci019.stdout        |   2 +-
 testsuite/tests/ghci/scripts/ghci023.stdout        |  16 +--
 testsuite/tests/ghci/scripts/ghci025.stdout        |  26 +++--
 testsuite/tests/ghci/scripts/ghci027.stdout        |   8 +-
 testsuite/tests/ghci/scripts/ghci046.stdout        |   4 +-
 testsuite/tests/ghci/scripts/ghci055.stdout        |   2 +-
 testsuite/tests/module/mod87.stderr                |   6 +-
 testsuite/tests/module/mod97.stderr                |   7 +-
 .../tests/numeric/should_compile/T7116.stdout      |  37 ++++--
 .../should_fail/overloadedlistsfail01.stderr       |  67 +++++------
 .../should_fail/overloadedlistsfail02.stderr       |  20 ++--
 .../ghci/overloadedlabelsghci01.stdout             |   2 +-
 .../should_compile/ExtraConstraints3.stderr        |  52 +++++----
 .../tests/partial-sigs/should_fail/T10999.stderr   |   7 +-
 testsuite/tests/quotes/TH_localname.stderr         |  50 ++++----
 testsuite/tests/rebindable/rebindable6.stderr      | 126 ++++++++++-----------
 .../should_fail/RnStaticPointersFail02.stderr      |   7 +-
 testsuite/tests/roles/should_compile/Roles1.stderr |  60 +++++++---
 .../tests/roles/should_compile/Roles13.stderr      |  44 +++----
 .../tests/roles/should_compile/Roles14.stderr      |  11 +-
 testsuite/tests/roles/should_compile/Roles2.stderr |  20 +++-
 testsuite/tests/roles/should_compile/Roles3.stderr |  36 ++++--
 testsuite/tests/roles/should_compile/Roles4.stderr |  20 +++-
 testsuite/tests/roles/should_compile/T8958.stderr  |  24 ++--
 .../tests/simplCore/should_compile/T3717.stderr    |  28 ++---
 .../tests/simplCore/should_compile/T3772.stdout    |  28 ++---
 .../tests/simplCore/should_compile/T4908.stderr    |  17 +--
 .../tests/simplCore/should_compile/T4930.stderr    |  38 ++++---
 .../tests/simplCore/should_compile/T5366.stdout    |   2 +-
 .../tests/simplCore/should_compile/T7360.stderr    |  71 +++++++-----
 .../tests/simplCore/should_compile/T7865.stdout    |   4 +-
 .../tests/simplCore/should_compile/T8274.stdout    |  20 ++--
 .../tests/simplCore/should_compile/T8832.stdout    |  20 ++--
 .../simplCore/should_compile/T8832.stdout-ws-32    |  16 +--
 .../tests/simplCore/should_compile/T9400.stderr    |   9 +-
 .../simplCore/should_compile/spec-inline.stderr    | 101 ++++++++++-------
 testsuite/tests/stranal/should_compile/Makefile    |   6 +-
 .../tests/stranal/should_compile/T10482.stdout     |   2 +-
 .../tests/stranal/should_compile/T10482a.stdout    |   8 +-
 testsuite/tests/th/T3319.stderr                    |   2 +-
 testsuite/tests/th/T5700.stderr                    |   2 +-
 testsuite/tests/th/T7276.stderr                    |  13 ++-
 testsuite/tests/th/TH_Roles2.stderr                |   9 +-
 testsuite/tests/th/TH_foreignInterruptible.stderr  |   3 +-
 .../tests/typecheck/should_compile/holes2.stderr   |  35 +++---
 .../tests/typecheck/should_fail/T10971b.stderr     | 124 ++++++++++----------
 testsuite/tests/typecheck/should_fail/T5095.stderr |  28 ++---
 testsuite/tests/typecheck/should_fail/T8262.stderr |   2 +-
 .../typecheck/should_fail/TcCoercibleFail.stderr   |   3 +-
 .../should_fail/TcStaticPointersFail02.stderr      |  20 ++--
 .../tests/typecheck/should_fail/tcfail068.stderr   |  28 ++---
 .../tests/typecheck/should_fail/tcfail072.stderr   |  32 +++---
 .../tests/typecheck/should_fail/tcfail123.stderr   |  10 +-
 .../tests/typecheck/should_fail/tcfail128.stderr   |  40 +++----
 .../tests/typecheck/should_fail/tcfail133.stderr   |  42 +++----
 .../tests/typecheck/should_fail/tcfail200.stderr   |   2 +-
 .../tests/typecheck/should_fail/tcfail220.stderr   |   2 +-
 testsuite/tests/typecheck/should_run/T8119.stdout  |   2 +-
 .../wcompat-warnings/WCompatWarningsOn.stderr      |   6 +-
 85 files changed, 1055 insertions(+), 814 deletions(-)

Diff suppressed because of size. To see it, use:

    git diff-tree --root --patch-with-stat --no-color --find-copies-harder --ignore-space-at-eol --cc e2c917381ff099820b1ee30fcfa8bc0c20cf5c1f