diff options
| author | xplorld <xplorld@gmail.com> | 2019-07-13 13:20:56 -0700 |
|---|---|---|
| committer | Marge Bot <ben+marge-bot@smart-cactus.org> | 2019-07-14 08:32:48 -0400 |
| commit | fce8f240a23ebbf04fd7e769919b00eee9737028 (patch) | |
| tree | 2756405c86b0c8fea310c79fbc19280447178785 | |
| parent | d7c6c4717cdf1b7bd8550e37da66c52275c802f0 (diff) | |
| download | haskell-fce8f240a23ebbf04fd7e769919b00eee9737028.tar.gz | |
rename type parameter in `instance Applicative ((->) a)`, fixing #16928
| -rw-r--r-- | libraries/base/GHC/Base.hs | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/T8535.stdout | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/scripts/ghci020.stdout | 2 | ||||
| -rw-r--r-- | testsuite/tests/ghci/should_run/T10145.stdout | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/libraries/base/GHC/Base.hs b/libraries/base/GHC/Base.hs index d0e181c742..b0160ab460 100644 --- a/libraries/base/GHC/Base.hs +++ b/libraries/base/GHC/Base.hs @@ -813,7 +813,7 @@ instance Functor ((->) r) where fmap = (.) -- | @since 2.01 -instance Applicative ((->) a) where +instance Applicative ((->) r) where pure = const (<*>) f g x = f x (g x) liftA2 q f g x = q (f x) (g x) diff --git a/testsuite/tests/ghci/scripts/T8535.stdout b/testsuite/tests/ghci/scripts/T8535.stdout index a0a5730d2b..4effb90a52 100644 --- a/testsuite/tests/ghci/scripts/T8535.stdout +++ b/testsuite/tests/ghci/scripts/T8535.stdout @@ -1,6 +1,6 @@ data (->) (a :: TYPE q) (b :: TYPE r) -- Defined in ‘GHC.Prim’ infixr -1 -> -instance Applicative ((->) a) -- Defined in ‘GHC.Base’ +instance Applicative ((->) r) -- Defined in ‘GHC.Base’ instance Functor ((->) r) -- Defined in ‘GHC.Base’ instance Monad ((->) r) -- Defined in ‘GHC.Base’ instance Monoid b => Monoid (a -> b) -- Defined in ‘GHC.Base’ diff --git a/testsuite/tests/ghci/scripts/ghci020.stdout b/testsuite/tests/ghci/scripts/ghci020.stdout index a0a5730d2b..4effb90a52 100644 --- a/testsuite/tests/ghci/scripts/ghci020.stdout +++ b/testsuite/tests/ghci/scripts/ghci020.stdout @@ -1,6 +1,6 @@ data (->) (a :: TYPE q) (b :: TYPE r) -- Defined in ‘GHC.Prim’ infixr -1 -> -instance Applicative ((->) a) -- Defined in ‘GHC.Base’ +instance Applicative ((->) r) -- Defined in ‘GHC.Base’ instance Functor ((->) r) -- Defined in ‘GHC.Base’ instance Monad ((->) r) -- Defined in ‘GHC.Base’ instance Monoid b => Monoid (a -> b) -- Defined in ‘GHC.Base’ diff --git a/testsuite/tests/ghci/should_run/T10145.stdout b/testsuite/tests/ghci/should_run/T10145.stdout index a0a5730d2b..4effb90a52 100644 --- a/testsuite/tests/ghci/should_run/T10145.stdout +++ b/testsuite/tests/ghci/should_run/T10145.stdout @@ -1,6 +1,6 @@ data (->) (a :: TYPE q) (b :: TYPE r) -- Defined in ‘GHC.Prim’ infixr -1 -> -instance Applicative ((->) a) -- Defined in ‘GHC.Base’ +instance Applicative ((->) r) -- Defined in ‘GHC.Base’ instance Functor ((->) r) -- Defined in ‘GHC.Base’ instance Monad ((->) r) -- Defined in ‘GHC.Base’ instance Monoid b => Monoid (a -> b) -- Defined in ‘GHC.Base’ |