Ticket #7338: 0001-New-output-for-duplicate-signatures-ticket-7338.2.patch

File 0001-New-output-for-duplicate-signatures-ticket-7338.2.patch, 3.0 KB (added by michalt, 3 years ago)
  • tests/module/mod68.stderr

    From 3aedef91213dac17022df54a712092aae9841131 Mon Sep 17 00:00:00 2001
    From: Michal Terepeta <[email protected]>
    Date: Wed, 24 Oct 2012 20:57:44 +0200
    Subject: [PATCH 1/2] New output for duplicate signatures (ticket #7338)
    
    ---
     tests/module/mod68.stderr                 |  6 +++---
     tests/rename/should_fail/T5589.hs         | 17 +++++++++++++----
     tests/rename/should_fail/T5589.stderr     | 22 ++++++++++++++++++----
     tests/rename/should_fail/rnfail048.stderr | 14 +++++++-------
     4 files changed, 41 insertions(+), 18 deletions(-)
    
    diff --git a/tests/module/mod68.stderr b/tests/module/mod68.stderr
    index 2d5ece6..ac2b8cb 100644
    a b  
    11 
    2 mod68.hs:4:1: 
    3     Duplicate type signature: 
    4       mod68.hs:4:1-16: f :: Int -> Bool 
     2mod68.hs:3:1: 
     3    Duplicate type signature for f: 
    54      mod68.hs:3:1-16: f :: Int -> Bool 
     5      mod68.hs:4:1-16: f :: Int -> Bool 
  • tests/rename/should_fail/T5589.hs

    diff --git a/tests/rename/should_fail/T5589.hs b/tests/rename/should_fail/T5589.hs
    index c7708e5..c85f8a5 100644
    a b  
    11module T5589 where 
    22 
    3 bbb, aaa :: Int 
    4 aaa :: Int 
    5 aaa = undefined 
    6 bbb = undefined 
     3b, a :: Int 
     4a :: Int 
     5a = undefined 
     6b = undefined 
     7 
     8b, c :: Int 
     9c = undefined 
     10 
     11c, d :: Int 
     12d = undefined 
     13 
     14e, e :: Int 
     15e = undefined 
  • tests/rename/should_fail/T5589.stderr

    diff --git a/tests/rename/should_fail/T5589.stderr b/tests/rename/should_fail/T5589.stderr
    index f5f3a01..dc027f2 100644
    a b  
    11 
    2 T5589.hs:4:1: 
    3     Duplicate type signature: 
    4       T5589.hs:4:1-10: aaa :: Int 
    5       T5589.hs:3:1-15: bbb, aaa :: Int 
     2T5589.hs:3:1: 
     3    Duplicate type signature for a: 
     4      T5589.hs:3:1-11: b, a :: Int 
     5      T5589.hs:4:1-8: a :: Int 
     6 
     7T5589.hs:3:1: 
     8    Duplicate type signature for b: 
     9      T5589.hs:3:1-11: b, a :: Int 
     10      T5589.hs:8:1-11: b, c :: Int 
     11 
     12T5589.hs:8:1: 
     13    Duplicate type signature for c: 
     14      T5589.hs:8:1-11: b, c :: Int 
     15      T5589.hs:11:1-11: c, d :: Int 
     16 
     17T5589.hs:14:1: 
     18    Duplicate type signature for e: 
     19      T5589.hs:14:1-11: e, e :: Int 
  • tests/rename/should_fail/rnfail048.stderr

    diff --git a/tests/rename/should_fail/rnfail048.stderr b/tests/rename/should_fail/rnfail048.stderr
    index 885229d..9306be9 100644
    a b  
    11 
    2 rnfail048.hs:11:1: 
    3     Duplicate INLINE pragma: 
    4       rnfail048.hs:11:1-18: {-# INLINE foo #-} 
    5       rnfail048.hs:10:1-22: {-# INLINE[~2] foo #-} 
    6       rnfail048.hs:9:1-21: {-# INLINE[1] foo #-} 
    7       rnfail048.hs:8:1-20: {-# NOINLINE foo #-} 
    8       rnfail048.hs:7:1-24: {-# NOINLINE[~2] foo #-} 
     2rnfail048.hs:6:1: 
     3    Duplicate INLINE pragma for foo: 
    94      rnfail048.hs:6:1-23: {-# NOINLINE[1] foo #-} 
     5      rnfail048.hs:7:1-24: {-# NOINLINE[~2] foo #-} 
     6      rnfail048.hs:8:1-20: {-# NOINLINE foo #-} 
     7      rnfail048.hs:9:1-21: {-# INLINE[1] foo #-} 
     8      rnfail048.hs:10:1-22: {-# INLINE[~2] foo #-} 
     9      rnfail048.hs:11:1-18: {-# INLINE foo #-}