Remove glean/hs dependencies in glean/lang/clang

Differential Revision: D68551727 fbshipit-source-id: a37a02e68deada926f473c2fdd9cea851801c2ca
facebookincubator · Jan 24, 2025 · 90d437e · 90d437e
1 parent c637787
commit 90d437e
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 3 deletions.
diff --git a/glean.cabal.in b/glean.cabal.in
@@ -1536,6 +1536,7 @@ test-suite clang-test-derivefamilies
     ghc-options: -main-is Glean.Clang.DeriveFamilies
     build-depends:
        glean:if-glean-hs,
+       glean:client-hs,
        glean:core,
        glean:regression-test-lib,
        glean:clang-derive-lib,
@@ -1557,6 +1558,7 @@ test-suite clang-test-deriveattributes
     ghc-options: -main-is Glean.Clang.DeriveAttrs
     build-depends:
        glean:if-glean-hs,
+       glean:client-hs,
        glean:core,
        glean:regression-test-lib,
        glean:clang-derive-lib,
@@ -1578,6 +1580,7 @@ test-suite clang-test-derivefuncalls
     ghc-options: -main-is Glean.Clang.DeriveFunCalls
     build-depends:
        glean:if-glean-hs,
+       glean:client-hs,
        glean:core,
        glean:regression-test-lib,
        glean:clang-derive-lib,
@@ -1599,6 +1602,7 @@ test-suite clang-test-deriveobjcinherit
     ghc-options: -main-is Glean.Clang.DeriveObjCInheritance
     build-depends:
        glean:if-glean-hs,
+       glean:client-hs,
        glean:core,
        glean:regression-test-lib,
        glean:clang-derive-lib,
@@ -1620,6 +1624,7 @@ test-suite clang-test-codemarkup
     ghc-options: -main-is Glean.Clang.CodeMarkup
     build-depends:
        glean:if-glean-hs,
+       glean:client-hs,
        glean:core,
        glean:regression-test-lib,
        glean:clang-derive-lib,

diff --git a/glean/lang/clang/Derive/Lib.hs b/glean/lang/clang/Derive/Lib.hs
@@ -21,9 +21,9 @@ import Data.Text (Text)
 import qualified Data.Text as Text
 import qualified Options.Applicative as O
 
+import Glean
 import qualified Glean.Schema.Cxx1 as Cxx
 import qualified Glean.Schema.Src as Src
-import Glean.Typed
 
 import Derive.Env
 

diff --git a/glean/lang/clang/tests/Glean/Clang/Test/DerivePass.hs b/glean/lang/clang/tests/Glean/Clang/Test/DerivePass.hs
@@ -12,12 +12,11 @@ module Glean.Clang.Test.DerivePass (testDeriver, driver, derivePasses) where
 import Control.Monad
 import Data.Default
 
-import Glean.Backend.Types
+import Glean
 import Glean.Indexer
 import qualified Glean.Clang.Test as Clang
 import Glean.Regression.Snapshot.Driver
 import Glean.Regression.Snapshot
-import Glean.Types
 
 import Derive.Env (withEnv)
 import Derive.Lib (dispatchDerive, DerivePass, allPredicates)