diff options
| author | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-03-31 08:53:36 -0400 |
|---|---|---|
| committer | Ryan Scott <ryan.gl.scott@gmail.com> | 2020-03-31 08:53:38 -0400 |
| commit | 89c4679b8fea58f656ffb3f4408d36d25879e2aa (patch) | |
| tree | b60fad2e561030de68491516cd76d91bd7d2f401 | |
| parent | f024b6e385bd1448968b7bf20de05f655c815bae (diff) | |
| download | haskell-wip/T17979.tar.gz | |
Fix the changelog/@since information for hGetContents'/getContents'/readFile'wip/T17979
Fixes #17979.
[ci skip]
| -rw-r--r-- | libraries/base/GHC/IO/Handle/Text.hs | 2 | ||||
| -rw-r--r-- | libraries/base/System/IO.hs | 4 | ||||
| -rw-r--r-- | libraries/base/changelog.md | 6 |
3 files changed, 6 insertions, 6 deletions
diff --git a/libraries/base/GHC/IO/Handle/Text.hs b/libraries/base/GHC/IO/Handle/Text.hs index b1533e3c5d..20a449f39d 100644 --- a/libraries/base/GHC/IO/Handle/Text.hs +++ b/libraries/base/GHC/IO/Handle/Text.hs @@ -466,7 +466,7 @@ getSomeCharacters handle_@Handle__{..} buf@Buffer{..} = -- | The 'hGetContents'' operation reads all input on the given handle -- before returning it as a 'String' and closing the handle. -- --- @since 4.14.0.0 +-- @since 4.15.0.0 hGetContents' :: Handle -> IO String hGetContents' handle = do diff --git a/libraries/base/System/IO.hs b/libraries/base/System/IO.hs index 70bc61c90b..4f3693a872 100644 --- a/libraries/base/System/IO.hs +++ b/libraries/base/System/IO.hs @@ -312,7 +312,7 @@ getContents = hGetContents stdin -- which is fully read before being returned -- (same as 'hGetContents'' 'stdin'). -- --- @since 4.14.0.0 +-- @since 4.15.0.0 getContents' :: IO String getContents' = hGetContents' stdin @@ -337,7 +337,7 @@ readFile name = openFile name ReadMode >>= hGetContents -- returns the contents of the file as a string. -- The file is fully read before being returned, as with 'getContents''. -- --- @since 4.14.0.0 +-- @since 4.15.0.0 readFile' :: FilePath -> IO String readFile' name = openFile name ReadMode >>= hGetContents' diff --git a/libraries/base/changelog.md b/libraries/base/changelog.md index 741b5ebca2..5abb4701b4 100644 --- a/libraries/base/changelog.md +++ b/libraries/base/changelog.md @@ -6,6 +6,9 @@ call, ensuring that the call can be interrupted with `SIGINT` on POSIX systems. + * Add `hGetContents'`, `getContents'`, and `readFile'` in `System.IO`: + Strict IO variants of `hGetContents`, `getContents`, and `readFile`. + ## 4.14.0.0 *TBA* * Bundled with GHC 8.10.1 @@ -51,9 +54,6 @@ * Add `IsList` instance for `ZipList`. - * Add `hGetContents'`, `getContents'`, and `readFile'` in `System.IO`: - Strict IO variants of `hGetContents`, `getContents`, and `readFile`. - ## 4.13.0.0 *July 2019* * Bundled with GHC 8.8.1 |