diff --git a/CHANGES.markdown b/CHANGES.markdown --- a/CHANGES.markdown +++ b/CHANGES.markdown @@ -1,3 +1,8 @@ +## Changes in 0.11.1 [2020.01.27] + - Sync with `base-4.14`/GHC 8.10 + - Backport `isResourceVanishedError`, `resourceVanishedErrorType`, and + `isResourceVanishedErrorType` to `System.IO.Error.Compat`. + ## Changes in 0.11.0 [2019.09.06] - Sync with `base-4.13`/GHC 8.8 - Backport `MonadFail(fail)` to `Prelude.Compat` and `Control.Monad.Compat`. diff --git a/README.markdown b/README.markdown --- a/README.markdown +++ b/README.markdown @@ -150,6 +150,8 @@ * `unsafeFixIO` and `unsafeDupablePerformIO` to `System.IO.Unsafe.IO` * `RuntimeRep`-polymorphic `($!)` to `Prelude.Compat` * `RuntimeRep`-polymorphic `throw` to `Control.Exception.Compat` + * `isResourceVanishedError`, `resourceVanishedErrorType`, and + `isResourceVanishedErrorType` to `System.IO.Error.Compat` ## What is not covered @@ -302,38 +304,18 @@ ## Supported versions of GHC/`base` - * `ghc-8.8.1` / `base-4.13.0.0` - * `ghc-8.6.5` / `base-4.12.0.0` - * `ghc-8.6.4` / `base-4.12.0.0` - * `ghc-8.6.3` / `base-4.12.0.0` - * `ghc-8.6.2` / `base-4.12.0.0` - * `ghc-8.6.1` / `base-4.12.0.0` - * `ghc-8.4.4` / `base-4.11.1.0` - * `ghc-8.4.3` / `base-4.11.1.0` - * `ghc-8.4.2` / `base-4.11.1.0` - * `ghc-8.4.1` / `base-4.11.0.0` - * `ghc-8.2.2` / `base-4.10.1.0` - * `ghc-8.2.1` / `base-4.10.0.0` - * `ghc-8.0.2` / `base-4.9.1.0` - * `ghc-8.0.1` / `base-4.9.0.0` - * `ghc-7.10.3` / `base-4.8.2.0` - * `ghc-7.10.2` / `base-4.8.1.0` - * `ghc-7.10.1` / `base-4.8.0.0` - * `ghc-7.8.4` / `base-4.7.0.2` - * `ghc-7.8.3` / `base-4.7.0.1` - * `ghc-7.8.2` / `base-4.7.0.0` - * `ghc-7.8.1` / `base-4.7.0.0` - * `ghc-7.6.3` / `base-4.6.0.1` - * `ghc-7.6.2` / `base-4.6.0.1` - * `ghc-7.6.1` / `base-4.6.0.0` - * `ghc-7.4.2` / `base-4.5.1.0` - * `ghc-7.4.1` / `base-4.5.0.0` - * `ghc-7.2.2` / `base-4.4.1.0` - * `ghc-7.2.1` / `base-4.4.0.0` - * `ghc-7.0.4` / `base-4.3.1.0` - * `ghc-7.0.3` / `base-4.3.1.0` - * `ghc-7.0.2` / `base-4.3.1.0` - * `ghc-7.0.1` / `base-4.3.0.0` + * `ghc-8.10.*` / `base-4.14.*` + * `ghc-8.8.*` / `base-4.13.*` + * `ghc-8.6.*` / `base-4.12.*` + * `ghc-8.4.*` / `base-4.11.*` + * `ghc-8.2.*` / `base-4.10.*` + * `ghc-8.0.*` / `base-4.9.*` + * `ghc-7.10.*` / `base-4.8.*` + * `ghc-7.8.*` / `base-4.7.*` + * `ghc-7.6.*` / `base-4.6.*` + * `ghc-7.4.*` / `base-4.5.*` + * `ghc-7.2.*` / `base-4.4.*` + * `ghc-7.0.*` / `base-4.3.*` We also make an attempt to keep `base-compat` building with GHC HEAD, but due to its volatility, it may not work at any given point in time. If it doesn't, diff --git a/base-compat.cabal b/base-compat.cabal --- a/base-compat.cabal +++ b/base-compat.cabal @@ -1,5 +1,5 @@ name: base-compat -version: 0.11.0 +version: 0.11.1 license: MIT license-file: LICENSE copyright: (c) 2012-2018 Simon Hengel, @@ -43,17 +43,18 @@ module with the suffix @.Repl@, which are distinct from anything in @base-compat-batteries@, to allow for easier use in GHCi. -tested-with: GHC == 7.0.* - , GHC == 7.2.* - , GHC == 7.4.* - , GHC == 7.6.* - , GHC == 7.8.* - , GHC == 7.10.* - , GHC == 8.0.* - , GHC == 8.2.* - , GHC == 8.4.* - , GHC == 8.6.* - , GHC == 8.8.* +tested-with: GHC == 7.0.4 + , GHC == 7.2.2 + , GHC == 7.4.2 + , GHC == 7.6.3 + , GHC == 7.8.4 + , GHC == 7.10.3 + , GHC == 8.0.2 + , GHC == 8.2.2 + , GHC == 8.4.4 + , GHC == 8.6.5 + , GHC == 8.8.2 + , GHC == 8.10.1 extra-source-files: CHANGES.markdown, README.markdown source-repository head @@ -131,6 +132,7 @@ Prelude.Compat System.Environment.Compat System.Exit.Compat + System.IO.Error.Compat System.IO.Unsafe.Compat Text.Read.Compat Type.Reflection.Compat @@ -189,6 +191,7 @@ Prelude.Compat.Repl System.Environment.Compat.Repl System.Exit.Compat.Repl + System.IO.Error.Compat.Repl System.IO.Unsafe.Compat.Repl Text.Read.Compat.Repl Type.Reflection.Compat.Repl diff --git a/src/System/IO/Error/Compat.hs b/src/System/IO/Error/Compat.hs new file mode 100644 --- /dev/null +++ b/src/System/IO/Error/Compat.hs @@ -0,0 +1,37 @@ +{-# LANGUAGE CPP, NoImplicitPrelude #-} +module System.IO.Error.Compat ( + module Base +, isResourceVanishedError +, resourceVanishedErrorType +, isResourceVanishedErrorType +) where + +import System.IO.Error as Base + +#if !(MIN_VERSION_base(4,14,0)) +import GHC.IO.Exception (IOErrorType(..)) +import Prelude.Compat + +-- | An error indicating that the operation failed because the +-- resource vanished. See 'resourceVanishedErrorType'. +-- +-- /Since 4.14.0.0/ +isResourceVanishedError :: IOError -> Bool +isResourceVanishedError = isResourceVanishedErrorType . ioeGetErrorType + +-- | I\/O error where the operation failed because the resource vanished. +-- This happens when, for example, attempting to write to a closed +-- socket or attempting to write to a named pipe that was deleted. +-- +-- /Since 4.14.0.0/ +resourceVanishedErrorType :: IOErrorType +resourceVanishedErrorType = ResourceVanished + +-- | I\/O error where the operation failed because the resource vanished. +-- See 'resourceVanishedErrorType'. +-- +-- /Since 4.14.0.0/ +isResourceVanishedErrorType :: IOErrorType -> Bool +isResourceVanishedErrorType ResourceVanished = True +isResourceVanishedErrorType _ = False +#endif diff --git a/src/System/IO/Error/Compat/Repl.hs b/src/System/IO/Error/Compat/Repl.hs new file mode 100644 --- /dev/null +++ b/src/System/IO/Error/Compat/Repl.hs @@ -0,0 +1,8 @@ +{-# LANGUAGE PackageImports #-} +{-# OPTIONS_GHC -fno-warn-dodgy-exports -fno-warn-unused-imports #-} +-- | Reexports "System.IO.Error.Compat" +-- from a globally unique namespace. +module System.IO.Error.Compat.Repl ( + module System.IO.Error.Compat +) where +import "this" System.IO.Error.Compat