From cd0750ec96fba9b1683b25954092439c0f267fd7 Mon Sep 17 00:00:00 2001 From: Joachim Breitner Date: Tue, 12 Jul 2016 17:21:07 +0200 Subject: tidyOccNames: Rename variables fairly So that > :t (id,id,id) produces (id,id,id) :: (a3 -> a3, a2 -> a2, a1 -> a1) instead of (id,id,id) :: (a2 -> a2, a1 -> a1, a -> a) Differential Revision: https://phabricator.haskell.org/D2402 --- testsuite/tests/ado/ado004.stderr | 14 +++++++------- testsuite/tests/driver/werror.stderr | 2 +- testsuite/tests/ghci/scripts/T6018ghcifail.stderr | 2 +- testsuite/tests/ghci/scripts/T7587.stdout | 2 +- testsuite/tests/ghci/scripts/T7730.stdout | 2 +- testsuite/tests/ghci/scripts/ghci013.stdout | 2 +- testsuite/tests/partial-sigs/should_compile/Uncurry.stderr | 2 +- testsuite/tests/typecheck/should_compile/tc168.stderr | 2 +- testsuite/tests/typecheck/should_fail/T6018fail.stderr | 2 +- .../tests/typecheck/should_fail/T6018failclosed.stderr | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) (limited to 'testsuite/tests') diff --git a/testsuite/tests/ado/ado004.stderr b/testsuite/tests/ado/ado004.stderr index ec2ebbc50d..20f04d01e7 100644 --- a/testsuite/tests/ado/ado004.stderr +++ b/testsuite/tests/ado/ado004.stderr @@ -18,17 +18,17 @@ TYPE SIGNATURES (Num b, Num t, Functor f) => (t -> f b) -> f b test3 :: - forall a t (m :: * -> *) t1. - (Num t1, Monad m) => - (t1 -> m t) -> (t -> t -> m a) -> m a + forall a t1 (m :: * -> *) t2. + (Num t2, Monad m) => + (t2 -> m t1) -> (t1 -> t1 -> m a) -> m a test4 :: - forall a a1 (m :: * -> *) t. + forall a1 a2 (m :: * -> *) t. (Num t, Monad m) => - (t -> m a1) -> (a1 -> a1 -> m a) -> m a + (t -> m a2) -> (a2 -> a2 -> m a1) -> m a1 test5 :: - forall a a1 (m :: * -> *) t. + forall a1 a2 (m :: * -> *) t. (Num t, Monad m) => - (t -> m a1) -> (a1 -> a1 -> m a) -> m a + (t -> m a2) -> (a2 -> a2 -> m a1) -> m a1 test6 :: forall a (m :: * -> *) t. (Num (m a), Monad m) => diff --git a/testsuite/tests/driver/werror.stderr b/testsuite/tests/driver/werror.stderr index ae18bb62f0..67c8112ee3 100644 --- a/testsuite/tests/driver/werror.stderr +++ b/testsuite/tests/driver/werror.stderr @@ -18,7 +18,7 @@ werror.hs:10:1: warning: [-Wunused-top-binds (in -Wextra, -Wunused-binds)] werror.hs:10:1: warning: [-Wmissing-signatures (in -Wall)] Top-level binding with no type signature: - f :: forall a a1. [a1] -> [a] + f :: forall a1 a2. [a2] -> [a1] werror.hs:10:1: warning: [-Wincomplete-patterns (in -Wextra)] Pattern match(es) are non-exhaustive diff --git a/testsuite/tests/ghci/scripts/T6018ghcifail.stderr b/testsuite/tests/ghci/scripts/T6018ghcifail.stderr index 048f45d288..9184aff580 100644 --- a/testsuite/tests/ghci/scripts/T6018ghcifail.stderr +++ b/testsuite/tests/ghci/scripts/T6018ghcifail.stderr @@ -49,7 +49,7 @@ :60:15: error: Type family equation violates injectivity annotation. - Kind variable ‘k1’ cannot be inferred from the right-hand side. + Kind variable ‘k2’ cannot be inferred from the right-hand side. Use -fprint-explicit-kinds to see the kind arguments In the type family equation: PolyKindVars '[] = '[] -- Defined at :60:15 diff --git a/testsuite/tests/ghci/scripts/T7587.stdout b/testsuite/tests/ghci/scripts/T7587.stdout index 776eb6d223..95e68c0d3f 100644 --- a/testsuite/tests/ghci/scripts/T7587.stdout +++ b/testsuite/tests/ghci/scripts/T7587.stdout @@ -1 +1 @@ -A :: k -> k1 -> * +A :: k1 -> k2 -> * diff --git a/testsuite/tests/ghci/scripts/T7730.stdout b/testsuite/tests/ghci/scripts/T7730.stdout index fcf9e4c1d2..e96e909413 100644 --- a/testsuite/tests/ghci/scripts/T7730.stdout +++ b/testsuite/tests/ghci/scripts/T7730.stdout @@ -1,7 +1,7 @@ type role A phantom phantom data A (x :: k) (y :: k1) -- Defined at :2:1 -A :: k -> k1 -> * +A :: k1 -> k2 -> * type role T phantom data T (a :: k) where MkT :: forall k (a :: k) a1. a1 -> T a diff --git a/testsuite/tests/ghci/scripts/ghci013.stdout b/testsuite/tests/ghci/scripts/ghci013.stdout index 695aaafc53..dacff446f5 100644 --- a/testsuite/tests/ghci/scripts/ghci013.stdout +++ b/testsuite/tests/ghci/scripts/ghci013.stdout @@ -1 +1 @@ -f :: Monad m => (m a, b) -> m b1 +f :: Monad m => (m a, b1) -> m b2 diff --git a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr index ce7372f061..f9bcf3a307 100644 --- a/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr +++ b/testsuite/tests/partial-sigs/should_compile/Uncurry.stderr @@ -1,5 +1,5 @@ TYPE SIGNATURES - unc :: forall w w1 w2. (w2 -> w1 -> w) -> (w2, w1) -> w + unc :: forall w1 w2 w3. (w3 -> w2 -> w1) -> (w3, w2) -> w1 TYPE CONSTRUCTORS COERCION AXIOMS Dependent modules: [] diff --git a/testsuite/tests/typecheck/should_compile/tc168.stderr b/testsuite/tests/typecheck/should_compile/tc168.stderr index 5bcce5b457..121d95f2d2 100644 --- a/testsuite/tests/typecheck/should_compile/tc168.stderr +++ b/testsuite/tests/typecheck/should_compile/tc168.stderr @@ -9,4 +9,4 @@ tc168.hs:17:1: error: • In the ambiguity check for the inferred type for ‘g’ To defer the ambiguity check to use sites, enable AllowAmbiguousTypes When checking the inferred type - g :: forall b a a1. C a1 (a, b) => a1 -> a + g :: forall b a1 a2. C a2 (a1, b) => a2 -> a1 diff --git a/testsuite/tests/typecheck/should_fail/T6018fail.stderr b/testsuite/tests/typecheck/should_fail/T6018fail.stderr index a8f857237d..11c665ac4f 100644 --- a/testsuite/tests/typecheck/should_fail/T6018fail.stderr +++ b/testsuite/tests/typecheck/should_fail/T6018fail.stderr @@ -69,7 +69,7 @@ T6018fail.hs:59:10: error: T6018fail.hs:62:15: error: Type family equation violates injectivity annotation. - Kind variable ‘k1’ cannot be inferred from the right-hand side. + Kind variable ‘k2’ cannot be inferred from the right-hand side. Use -fprint-explicit-kinds to see the kind arguments In the type family equation: PolyKindVars '[] = '[] -- Defined at T6018fail.hs:62:15 diff --git a/testsuite/tests/typecheck/should_fail/T6018failclosed.stderr b/testsuite/tests/typecheck/should_fail/T6018failclosed.stderr index 7a0146d7d7..3ceb044591 100644 --- a/testsuite/tests/typecheck/should_fail/T6018failclosed.stderr +++ b/testsuite/tests/typecheck/should_fail/T6018failclosed.stderr @@ -24,11 +24,11 @@ T6018failclosed.hs:19:5: error: T6018failclosed.hs:25:5: error: • Type family equation violates injectivity annotation. - Type and kind variables ‘k1’, ‘b’ + Type and kind variables ‘k2’, ‘b’ cannot be inferred from the right-hand side. Use -fprint-explicit-kinds to see the kind arguments In the type family equation: - forall k k1 (c :: k) (b :: k1). + forall k1 k2 (c :: k1) (b :: k2). JClosed Int b c = Char -- Defined at T6018failclosed.hs:25:5 • In the equations for closed type family ‘JClosed’ In the type family declaration for ‘JClosed’ -- cgit v1.2.1