Use pure

Author: ndmitchell

.ghci

@@ -4,10 +4,10 @@
 import qualified System.FilePath.Windows as W
 import qualified System.FilePath.Posix as P
 
-:def docs_ const $ return ":!cabal haddock"
-:def docs const $ return $ unlines [":docs_",":!start dist\\doc\\html\\filepath\\System-FilePath.html"]
+:def docs_ const $ pure ":!cabal haddock"
+:def docs const $ pure $ unlines [":docs_",":!start dist\\doc\\html\\filepath\\System-FilePath.html"]
 
-:def gen const $ return "Generate.main"
-:def test \x -> return $ if null x then "Test.main" else "System.Environment.withArgs [" ++ show x ++ "] Test.main"
-:def go \x -> return $ unlines [":reload",":gen",":reload",":test " ++ x,":gen",":reload"]
-:def testfull const $ return $ unlines [":reload","gen",":reload","!cabal test"]
+:def gen const $ pure "Generate.main"
+:def test \x -> pure $ if null x then "Test.main" else "System.Environment.withArgs [" ++ show x ++ "] Test.main"
+:def go \x -> pure $ unlines [":reload",":gen",":reload",":test " ++ x,":gen",":reload"]
+:def testfull const $ pure $ unlines [":reload","gen",":reload","!cabal test"]

Generate.hs

@@ -100,11 +100,11 @@ readFileBinary' :: FilePath -> IO String
 readFileBinary' file = withBinaryFile file ReadMode $ \h -> do
     s <- hGetContents h
     evaluate $ length s
-    return s
+    pure s
 
 writeFileBinaryChanged :: FilePath -> String -> IO ()
 writeFileBinaryChanged file x = do
     b <- doesFileExist file
-    old <- if b then fmap Just $ readFileBinary' file else return Nothing
+    old <- if b then fmap Just $ readFileBinary' file else pure Nothing
     when (Just x /= old) $
         writeFileBinary file x

tests/Test.hs

@@ -19,8 +19,8 @@ main = do
         putStrLn $ "Test " ++ show i ++ " of " ++ show total ++ ": " ++ msg
         res <- quickCheckWithResult stdArgs{chatty=False, maxSuccess=count} prop
         case res of
-            Success{} -> return Nothing
-            bad -> do putStrLn $ showOutput bad; putStrLn "TEST FAILURE!"; return $ Just (msg,bad)
+            Success{} -> pure Nothing
+            bad -> do putStrLn $ showOutput bad; putStrLn "TEST FAILURE!"; pure $ Just (msg,bad)
     if null bad then
         putStrLn $ "Success, " ++ show total ++ " tests passed"
      else do