Enable -Werror for developing & CI

cabal.project

@@ -23,6 +23,10 @@ allow-newer: haskeline:base
 -- https://github.com/TomMD/entropy/issues/75
 constraints: entropy < 0.4.1.9
 
+-- develop with -Werror on, for consistency with internal Meta CI.
+program-options
+    ghc-options: -Werror -Wwarn=dodgy-imports
+
 package fb-util
     flags: +folly
 

glean.cabal.in

@@ -49,6 +49,7 @@ common fb-haskell
         TypeFamilies
         TypeSynonymInstances
         NondecreasingIndentation
+        TypeOperators
 
     ghc-options: -Wall -Wno-orphans -Wno-name-shadowing
     if flag(opt)

glean/db/Glean/Query/Transform.hs

@@ -9,6 +9,7 @@
 {-# LANGUAGE GeneralizedNewtypeDeriving #-}
 {-# LANGUAGE DerivingStrategies #-}
 {-# LANGUAGE RecursiveDo #-}
+{-# LANGUAGE CPP #-}
 module Glean.Query.Transform
   ( transformationsFor
   , transformResultsBack

glean/db/Glean/Query/Typecheck/Unify.hs

@@ -13,7 +13,7 @@ module Glean.Query.Typecheck.Unify (
     zonkVars,
   ) where
 
-import Control.Monad.Except
+import Control.Monad
 import Control.Monad.State
 import qualified Data.IntMap as IntMap
 import qualified Data.Map as Map

glean/glass/Glean/Glass/Path.hs

@@ -8,8 +8,6 @@
 
 module Glean.Glass.Path where
 
-import qualified Data.Text as Text
-
 import Glean.Glass.Base ( SymbolRepoPath(..), GleanPath(GleanPath) )
 import qualified Glean.Glass.Types as Glass
 

glean/glass/Glean/Glass/RepoMapping.hs

@@ -13,7 +13,7 @@ module Glean.Glass.RepoMapping
   , allGleanRepos
   , supportsCxxDeclarationSources
   , mirrorConfig
-  , Mirror(Mirror)
+  , Mirror(..)
   ) where
 
 import Data.Set (Set)

glean/lang/clang/tests/Glean/Clang/Test.hs

@@ -39,7 +39,7 @@ driverWith deriveToo =
     driver' = driverFromIndexer indexer'
     baseIndexer = indexerWith deriveToo
     isSrcFile file = takeExtension file `elem` [".c", ".cpp", ".m", ".mm"]
-    withCompileCommandsFor opts params f = do
+    withCompileCommandsFor _opts params f = do
       srcFiles <- map (indexerRoot params </>) . filter isSrcFile <$>
         listDirectory (indexerRoot params)
       writeFile (indexerOutput params </> "compile_commands.json") $

glean/test/regression/Glean/Regression/Snapshot/Options.hs

@@ -14,12 +14,15 @@ module Glean.Regression.Snapshot.Options
   , optionsWith
   ) where
 
-import Control.Monad (unless)
 import qualified Options.Applicative as O
 import System.Directory
 import System.FilePath
+
+#if !defined(OSS)
+import Control.Monad (unless)
 import System.Process (readProcess)
 import Data.List (isPrefixOf, isSuffixOf)
+#endif
 
 data Config = Config
   { cfgProjectRoot :: FilePath
@@ -92,6 +95,7 @@ optionsWith other = O.info (O.helper <*> ((,) <$> parser <*> other)) O.fullDesc
         cfgReplace = replace
       }
 
+#if !defined(OSS)
 -- | Simple heuristics to get the path of the source files
 -- from the buck-out path. Will take a path like
 --
@@ -143,4 +147,4 @@ sourcePath path = do
       if x == y
       then go xs ys
       else go (x:xs) ys
-
+#endif