summaryrefslogtreecommitdiff
path: root/libraries/base
diff options
context:
space:
mode:
authorHerbert Valerio Riedel <hvr@gnu.org>2014-09-09 18:46:10 +0200
committerHerbert Valerio Riedel <hvr@gnu.org>2014-09-09 18:50:19 +0200
commit68ecc578c800aa2767dbf48863f4742859b1a8ec (patch)
tree3c8154e2b013fae9abc2ce9d026a87d4cd8899fb /libraries/base
parentc6f502b211d03ff8408b17932a4435e4d5f6cd31 (diff)
downloadhaskell-68ecc578c800aa2767dbf48863f4742859b1a8ec.tar.gz
base: replace ver 4.7.1.0 references by 4.8.0.0
Since we now had to major bump due to AMP being landed, `base-4.7.1.0` is not gonna happen, as we're going straight for a `base-4.8.0.0` release. [skip ci] since this is a doc-only change
Diffstat (limited to 'libraries/base')
-rw-r--r--libraries/base/Control/Monad.hs2
-rw-r--r--libraries/base/Data/Function.hs2
-rw-r--r--libraries/base/Data/List.hs2
-rw-r--r--libraries/base/GHC/TypeLits.hs4
-rw-r--r--libraries/base/System/Exit.hs2
-rw-r--r--libraries/base/changelog.md4
6 files changed, 9 insertions, 7 deletions
diff --git a/libraries/base/Control/Monad.hs b/libraries/base/Control/Monad.hs
index bfadd7ce1a..532c42c85f 100644
--- a/libraries/base/Control/Monad.hs
+++ b/libraries/base/Control/Monad.hs
@@ -335,7 +335,7 @@ infixl 4 <$!>
-- | Strict version of 'Data.Functor.<$>'.
--
--- /Since: 4.7.1.0/
+-- /Since: 4.8.0.0/
(<$!>) :: Monad m => (a -> b) -> m a -> m b
{-# INLINE (<$!>) #-}
f <$!> m = do
diff --git a/libraries/base/Data/Function.hs b/libraries/base/Data/Function.hs
index afb6e5693a..a3fac7ca4d 100644
--- a/libraries/base/Data/Function.hs
+++ b/libraries/base/Data/Function.hs
@@ -94,6 +94,6 @@ on :: (b -> b -> c) -> (a -> b) -> a -> a -> c
-- convenience. Its precedence is one higher than that of the forward
-- application operator '$', which allows '&' to be nested in '$'.
--
--- /Since: 4.7.1.0/
+-- /Since: 4.8.0.0/
(&) :: a -> (a -> b) -> b
x & f = f x
diff --git a/libraries/base/Data/List.hs b/libraries/base/Data/List.hs
index f7b58c18b1..5e5acc17ee 100644
--- a/libraries/base/Data/List.hs
+++ b/libraries/base/Data/List.hs
@@ -967,7 +967,7 @@ rqpart cmp x (y:ys) rle rgt r =
-- input list. This is called the decorate-sort-undecorate paradigm, or
-- Schwartzian transform.
--
--- /Since: 4.7.1.0/
+-- /Since: 4.8.0.0/
sortOn :: Ord b => (a -> b) -> [a] -> [a]
sortOn f =
map snd . sortBy (comparing fst) . map (\x -> let y = f x in y `seq` (y, x))
diff --git a/libraries/base/GHC/TypeLits.hs b/libraries/base/GHC/TypeLits.hs
index 7ae6fb0422..cd404f1f19 100644
--- a/libraries/base/GHC/TypeLits.hs
+++ b/libraries/base/GHC/TypeLits.hs
@@ -81,12 +81,12 @@ symbolVal :: forall n proxy. KnownSymbol n => proxy n -> String
symbolVal _ = case symbolSing :: SSymbol n of
SSymbol x -> x
--- | /Since: 4.7.1.0/
+-- | /Since: 4.8.0.0/
natVal' :: forall n. KnownNat n => Proxy# n -> Integer
natVal' _ = case natSing :: SNat n of
SNat x -> x
--- | /Since: 4.7.1.0/
+-- | /Since: 4.8.0.0/
symbolVal' :: forall n. KnownSymbol n => Proxy# n -> String
symbolVal' _ = case symbolSing :: SSymbol n of
SSymbol x -> x
diff --git a/libraries/base/System/Exit.hs b/libraries/base/System/Exit.hs
index 932cbfbd0f..33cc4e8b9a 100644
--- a/libraries/base/System/Exit.hs
+++ b/libraries/base/System/Exit.hs
@@ -78,6 +78,6 @@ exitSuccess = exitWith ExitSuccess
-- | Write given error message to `stderr` and terminate with `exitFailure`.
--
--- /Since: 4.7.1.0/
+-- /Since: 4.8.0.0/
die :: String -> IO a
die err = hPutStrLn stderr err >> exitFailure
diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md
index 4b97c58d08..6f3c8cc754 100644
--- a/libraries/base/changelog.md
+++ b/libraries/base/changelog.md
@@ -1,9 +1,11 @@
# Changelog for [`base` package](http://hackage.haskell.org/package/base)
-## 4.7.1.0 *TBA*
+## 4.8.0.0 *TBA*
* Bundled with GHC 7.10.1
+ * Make `Applicative` a superclass of `Monad`
+
* Add reverse application operator `Data.Function.(&)`
* Add `Data.List.sortOn` sorting function