From 23f7d4e4c745a9c5d2769cccdc2025c6a66af1c7 Mon Sep 17 00:00:00 2001 From: Geoffrey Mainland Date: Tue, 16 Sep 2014 11:56:31 -0400 Subject: [PATCH 1/2] Hide empty when importing Control.Monad. This is need for compatibility with AMP since Control.Monad now exports empty. --- tests/random1283.hs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tests/random1283.hs b/tests/random1283.hs index 2ad3530b1..33fc48862 100644 --- a/tests/random1283.hs +++ b/tests/random1283.hs @@ -1,5 +1,5 @@ import Control.Concurrent -import Control.Monad +import Control.Monad hiding (empty) import Data.Sequence (ViewL(..), empty, fromList, viewl, (<|), (|>), (><)) import System.Random From 74765698fc6e1ec50ae4bd986b796cc20081ce0b Mon Sep 17 00:00:00 2001 From: Geoffrey Mainland Date: Tue, 16 Sep 2014 11:57:35 -0400 Subject: [PATCH 2/2] Fix unused import warning. --- System/Random.hs | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/System/Random.hs b/System/Random.hs index 4efcad6ed..ab7727405 100644 --- a/System/Random.hs +++ b/System/Random.hs @@ -93,10 +93,11 @@ import Data.Ratio ( numerator, denominator ) #endif import Data.Char ( isSpace, chr, ord ) import System.IO.Unsafe ( unsafePerformIO ) -import Data.IORef ( IORef, atomicModifyIORef, newIORef, readIORef - , writeIORef ) +import Data.IORef ( IORef, newIORef, readIORef, writeIORef ) #if MIN_VERSION_base (4,6,0) import Data.IORef ( atomicModifyIORef' ) +#else +import Data.IORef ( atomicModifyIORef ) #endif import Numeric ( readDec )