re-indent wibble in Plugin.hs, add a newline to Annotation.hs and cle…

…an up NonTerminating test a little

Strict/Annotation.hs

@@ -5,4 +5,4 @@ import Data.Data
 -- | Programs which want to 'strictify' their functions should annotate them with the following
 -- datatype
 -- TODO: move this into a separate package perhaps?
-data Strictify = Strictify deriving (Typeable, Data)
+data Strictify = Strictify deriving (Typeable, Data)

Strict/Plugin.hs

@@ -6,7 +6,7 @@ import GHCPlugins
 
 plugin :: Plugin
 plugin = defaultPlugin {
-    installCoreToDos = install
+  installCoreToDos = install
   }
 
 install :: [CommandLineOption] -> [CoreToDo] -> CoreM [CoreToDo]

tests/NonTerminating.hs

@@ -2,17 +2,11 @@
 module Main ( main ) where
 import Strict.Annotation
 
-import Control.Exception ( evaluate )
-
-evaluate_and_possibly_timeout what = do
-    val <- evaluate what
-    putStrLn $ "Test failed due to the thing compiled terminating with value: " ++ show val
-
 {-# ANN foreverFrom Strictify #-}
 foreverFrom :: Int -> [Int]
 foreverFrom n = n : foreverFrom (n + 1)
 
 main :: IO ()
 main = do
-    let xs = foreverFrom 0
-    evaluate_and_possibly_timeout (take 10 xs)
+  let xs = foreverFrom 0
+  print (take 10 xs)