Merge pull request #92 from Shimuuar/chery-picking

Cherry picked commits from #88

System/Random/MWC.hs

@@ -159,7 +159,7 @@ module System.Random.MWC
 #endif
 
 import Control.Monad           (ap, liftM, unless)
-import Control.Monad.Primitive (PrimMonad, PrimBase, PrimState, unsafePrimToIO, unsafeSTToPrim)
+import Control.Monad.Primitive (PrimMonad, PrimBase, PrimState, unsafePrimToIO, stToPrim)
 import Control.Monad.ST        (ST,runST)
 import Data.Bits               ((.&.), (.|.), shiftL, shiftR, xor)
 import Data.Int                (Int8, Int16, Int32, Int64)
@@ -463,7 +463,7 @@ instance (s ~ PrimState m, PrimMonad m) => Random.StatefulGen (Gen s) m where
   {-# INLINE uniformWord32 #-}
   uniformWord64 = uniform
   {-# INLINE uniformWord64 #-}
-  uniformShortByteString n g = unsafeSTToPrim (Random.genShortByteStringST n (uniform g))
+  uniformShortByteString n g = stToPrim (Random.genShortByteStringST n (uniform g))
   {-# INLINE uniformShortByteString #-}
 
 -- | @since 0.15.0.0

System/Random/MWC/SeedSource.hs

@@ -22,9 +22,10 @@ import Foreign.Marshal.Array   (peekArray)
 #if defined(mingw32_HOST_OS)
 import Foreign.Ptr
 import Foreign.C.Types
+#else
+import System.IO        (IOMode(..), hGetBuf, withBinaryFile)
 #endif
 import System.CPUTime   (cpuTimePrecision, getCPUTime)
-import System.IO        (IOMode(..), hGetBuf, withBinaryFile)
 
 -- Acquire seed from current time. This is horrible fallback for
 -- Windows system.

cabal.project

@@ -1,5 +1,2 @@
 packages:
   mwc-random.cabal
-
-allow-newer:QuickCheck:splitmix
-allow-newer:QuickCheck:random