From 8b1729d8da802c6f8ffa2c8efd1118ef9ef543e0 Mon Sep 17 00:00:00 2001
From: Daniel Gröber <dxld@darkboxed.org>
Date: Sat, 15 Dec 2018 22:38:45 +0100
Subject: Rename helper command: s/compiler-version/compiler-id/

---
 lib/Distribution/Helper.hs           | 4 ++--
 src/CabalHelper/Compiletime/Types.hs | 2 +-
 src/CabalHelper/Runtime/Main.hs      | 6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/lib/Distribution/Helper.hs b/lib/Distribution/Helper.hs
index fb6fb7a..30153e2 100644
--- a/lib/Distribution/Helper.hs
+++ b/lib/Distribution/Helper.hs
@@ -430,7 +430,7 @@ readUnitInfo
            [ "package-id"
            , "package-db-stack"
            , "flags"
-           , "compiler-version"
+           , "compiler-id"
            , "config-flags"
            , "non-default-config-flags"
            , "component-info"
@@ -438,7 +438,7 @@ readUnitInfo
     let [ Just (ChResponseVersion        uiPackageId),
           Just (ChResponsePkgDbs         uiPackageDbStack),
           Just (ChResponseFlags          uiPackageFlags),
-          Just (ChResponseVersion        uiCompilerVersion),
+          Just (ChResponseVersion        uiCompilerId),
           Just (ChResponseFlags          uiConfigFlags),
           Just (ChResponseFlags          uiNonDefaultConfigFlags),
           Just (ChResponseComponentsInfo uiComponents)
diff --git a/src/CabalHelper/Compiletime/Types.hs b/src/CabalHelper/Compiletime/Types.hs
index e646f5e..e632c3b 100644
--- a/src/CabalHelper/Compiletime/Types.hs
+++ b/src/CabalHelper/Compiletime/Types.hs
@@ -172,7 +172,7 @@ data UnitInfo = UnitInfo
     -- ^ The components of the unit: libraries, executables, test-suites,
     -- benchmarks and so on.
 
-    , uiCompilerVersion       :: !(String, Version)
+    , uiCompilerId            :: !(String, Version)
     -- ^ The version of GHC the unit is configured to use
 
     , uiPackageDbStack        :: !([ChPkgDb])
diff --git a/src/CabalHelper/Runtime/Main.hs b/src/CabalHelper/Runtime/Main.hs
index 70a0cc5..2a72f37 100644
--- a/src/CabalHelper/Runtime/Main.hs
+++ b/src/CabalHelper/Runtime/Main.hs
@@ -243,7 +243,7 @@ usage = do
      ++"  | config-flags\n"
      ++"  | non-default-config-flags\n"
      ++"  | write-autogen-files\n"
-     ++"  | compiler-version\n"
+     ++"  | compiler-id\n"
      ++"  | component-info\n"
      ++"  | print-lbi [--human]\n"
      ++"  ) ...\n"
@@ -253,7 +253,7 @@ commands = [ "flags"
            , "config-flags"
            , "non-default-config-flags"
            , "write-autogen-files"
-           , "compiler-version"
+           , "compiler-id"
            , "package-db-stack"
            , "component-info"
            , "print-lbi"
@@ -346,7 +346,7 @@ main = do
       initialBuildStepsForAllComponents distdir pd lbi v
       return Nothing
 
-    "compiler-version":[] -> do
+    "compiler-id":[] -> do
       let CompilerId comp ver = compilerId $ compiler lbi
       return $ Just $ ChResponseVersion $ (,) (show comp) (toDataVersion ver)
 
-- 
cgit v1.2.3