Fix build errors on GHC 7.4.

kolmodin · May 1, 2016 · b96fde1 · b96fde1
1 parent 11c4d31
commit b96fde1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 29 deletions.
diff --git a/tests/test003-removefile.hs b/tests/test003-removefile.hs
@@ -3,15 +3,13 @@ module Main where
 
 import Control.Monad
 
-import Data.String
-
 import System.Directory
 
 import System.INotify as INotify
 
 import Utils
 
-file :: IsString s => s
+file :: String
 file = "hello"
 
 write :: String -> IO ()
@@ -37,9 +35,9 @@ main =
 
 expected :: [Event]
 expected =
-    [ Created   False file
-    , Opened    False (Just file)
-    , Modified  False (Just file)
-    , Closed    False (Just file) True
-    , Deleted   False file
+    [ Created   False "hello"
+    , Opened    False (Just "hello")
+    , Modified  False (Just "hello")
+    , Closed    False (Just "hello") True
+    , Deleted   False "hello"
     ]
diff --git a/tests/test004-modify-file.hs b/tests/test004-modify-file.hs
@@ -4,16 +4,14 @@ module Main where
 import Control.Exception
 import Control.Monad
 
-import Data.String
-
 import System.Directory
 import System.IO
 
 import System.INotify as INotify
 
 import Utils
 
-file :: IsString s => s
+file :: String
 file = "hello"
 
 write :: String -> IO ()
@@ -47,12 +45,12 @@ main =
 
 expected :: [Event]
 expected =
-    [ Created   False file
-    , Opened    False (Just file)
-    , Modified  False (Just file)
-    , Closed    False (Just file) True
-    , Opened    False (Just file)
-    , Modified  False (Just file)
-    , Closed    False (Just file) True
-    , Deleted   False file
+    [ Created   False "hello"
+    , Opened    False (Just "hello")
+    , Modified  False (Just "hello")
+    , Closed    False (Just "hello") True
+    , Opened    False (Just "hello")
+    , Modified  False (Just "hello")
+    , Closed    False (Just "hello") True
+    , Deleted   False "hello"
     ]
diff --git a/tests/test005-move-file.hs b/tests/test005-move-file.hs
@@ -3,15 +3,13 @@ module Main where
 
 import Control.Monad
 
-import Data.String
-
 import System.Directory
 
 import System.INotify as INotify
 
 import Utils
 
-file, file2 :: IsString s => s
+file, file2 :: String
 file = "hello"
 file2 = "hello2"
 
@@ -44,11 +42,11 @@ main =
 
 expected :: Cookie -> [Event]
 expected cookie =
-    [ Created   False file
-    , Opened    False (Just file)
-    , Modified  False (Just file)
-    , Closed    False (Just file) True
-    , MovedOut  False file  cookie
-    , MovedIn   False file2 cookie
-    , Deleted   False file2
+    [ Created   False "hello"
+    , Opened    False (Just "hello")
+    , Modified  False (Just "hello")
+    , Closed    False (Just "hello") True
+    , MovedOut  False "hello"  cookie
+    , MovedIn   False "hello2" cookie
+    , Deleted   False "hello2"
     ]