Simon Jakobi pushed to branch wip/sjakobi/multi-caret at Glasgow Haskell Compiler / GHC

Commits:

3 changed files:

Changes:

  • compiler/GHC/Tc/Errors/Ppr.hs
    ... ... @@ -3464,6 +3464,8 @@ instance Diagnostic TcRnMessage where
    3464 3464
           -> diagnosticRelatedLocations msg'
    
    3465 3465
         TcRnBindingNameConflict _ locs
    
    3466 3466
           -> NE.tail locs
    
    3467
    +    TcRnDuplicateDecls _ names
    
    3468
    +      -> map nameSrcSpan (NE.init names)
    
    3467 3469
         _ ->
    
    3468 3470
           []
    
    3469 3471
     
    

  • testsuite/tests/rename/should_fail/T7164.stderr
    1
    -
    
    2
    -T7164.hs:8:1: [GHC-29916]
    
    1
    +T7164.hs:8:1: error: [GHC-29916]
    
    3 2
         Multiple declarations of ‘derp’
    
    4 3
         Declared at: T7164.hs:5:5
    
    5 4
                      T7164.hs:8:1
    
    5
    +  |
    
    6
    +5 |     derp :: m a
    
    7
    +  |     ^^^^^^^^^^^
    
    8
    +  |
    
    9
    +8 | derp = 123
    
    10
    +  | ^^^^
    
    11
    +

  • testsuite/tests/rename/should_fail/all.T
    ... ... @@ -91,7 +91,7 @@ test('T6148a', normal, compile_fail, [''])
    91 91
     test('T6148b', normal, compile_fail, [''])
    
    92 92
     test('T6148c', normal, compile_fail, [''])
    
    93 93
     test('T6148d', normal, compile_fail, [''])
    
    94
    -test('T7164', normal, compile_fail, [''])
    
    94
    +test('T7164', normal, compile_fail, ['-fdiagnostics-show-caret'])
    
    95 95
     test('T7338', normal, compile_fail, [''])
    
    96 96
     test('T7338a', normal, compile_fail, [''])
    
    97 97
     test('T7454', normal, compile, [''])