Skip to content

Commit

Permalink
Merge #2540
Browse files Browse the repository at this point in the history
2540: Switch CI to GHC 8.10.2 r=mrBliss a=mrBliss

Update the dependencies to versions compatible with GHC 8.10.2.

Switch over CI to GHC 8.10.2.

Co-authored-by: Thomas Winant <thomas@well-typed.com>
Co-authored-by: Hamish Mackenzie <Hamish.K.Mackenzie@gmail.com>
Co-authored-by: Marcin Szamotulski <profunctor@pm.me>
  • Loading branch information
4 people committed Oct 16, 2020
2 parents 8d5a192 + 9a7b604 commit bb18d06
Show file tree
Hide file tree
Showing 3 changed files with 1 addition and 4 deletions.
1 change: 0 additions & 1 deletion io-sim-classes/src/Control/Monad/Class/MonadAsync.hs
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,6 @@ import Control.Monad.Reader
import qualified Control.Monad.STM as STM

import Data.Foldable (fold)
import Data.Functor (void)
import Data.Kind (Type)
import Data.Proxy

Expand Down
2 changes: 0 additions & 2 deletions io-sim-classes/src/Control/Monad/Class/MonadTimer.hs
Original file line number Diff line number Diff line change
Expand Up @@ -25,8 +25,6 @@ import Data.Time.Clock (DiffTime, diffTimeToPicoseconds)
#if defined(__GLASGOW_HASKELL__) && !defined(mingw32_HOST_OS) && !defined(__GHCJS__)
import qualified GHC.Event as GHC (TimeoutKey, getSystemTimerManager,
registerTimeout, unregisterTimeout, updateTimeout)
#else
import Control.Monad (when)
#endif

import Control.Monad.Class.MonadFork
Expand Down
2 changes: 1 addition & 1 deletion io-sim/test/Test/IOSim.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ import Data.Time.Clock (DiffTime, picosecondsToDiffTime)

import Control.Exception (ArithException (..))
import Control.Monad
import System.IO.Error (IOError, ioeGetErrorString, isUserError)
import System.IO.Error (ioeGetErrorString, isUserError)

import Control.Monad.Class.MonadFork
import Control.Monad.Class.MonadSay
Expand Down

0 comments on commit bb18d06

Please sign in to comment.