From bda559bf059ee42e3e01c1280f7a64dd2673d725 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Tue, 6 Aug 2019 19:39:23 +0200
Subject: Refactor Program versions handling

This mainly renames the program version getters to get* and make them
consistenly return Version directly. Such that wrappers like GhcVersion
have to be added at the callsites of the relevant functions.
---
 tests/CompileTest.hs | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'tests/CompileTest.hs')

diff --git a/tests/CompileTest.hs b/tests/CompileTest.hs
index c0280bf..8af7335 100644
--- a/tests/CompileTest.hs
+++ b/tests/CompileTest.hs
@@ -72,7 +72,7 @@ main = do
 
   case args of
     "list-versions":[] -> do
-        mapM_ print =<< relevantCabalVersions =<< ghcVersion
+        mapM_ print =<< relevantCabalVersions =<< (GhcVersion <$> getGhcVersion)
     "list-versions":ghc_ver_str:[] ->
         mapM_ print =<< relevantCabalVersions (GhcVersion (parseVer ghc_ver_str))
     _ ->
@@ -125,7 +125,7 @@ allCabalVersions (GhcVersion ghc_ver) = do
 
 testRelevantCabalVersions :: Env => IO ()
 testRelevantCabalVersions = do
-  ghc_ver <- ghcVersion
+  ghc_ver <- GhcVersion <$> getGhcVersion
   relevant_cabal_versions <- relevantCabalVersions ghc_ver
   testCabalVersions $ map CabalVersion relevant_cabal_versions ++ [CabalHEAD ()]
 
-- 
cgit v1.2.3