address Simon's feedback

Makefile

@@ -19,19 +19,19 @@ thrift:: thrift-cpp thrift-hs
 THRIFT_COMPILE = $(CABAL) new-run exe:thrift-compiler --
 
 thrift-hs::
-	$(THRIFT_COMPILE) --hs \
+	$(THRIFT_COMPILE) --hs --use-int \
 		lib/if/RpcOptions.thrift \
 		-o lib
-	$(THRIFT_COMPILE) --hs \
+	$(THRIFT_COMPILE) --hs --use-int \
 		lib/if/ApplicationException.thrift \
 		-o lib
-	$(THRIFT_COMPILE) --hs \
+	$(THRIFT_COMPILE) --hs --use-int \
 		lib/test/if/math.thrift \
 		-o lib/test
-	$(THRIFT_COMPILE) --hs \
+	$(THRIFT_COMPILE) --hs --use-int \
 		lib/test/if/echoer.thrift \
 		-o lib/test
-	$(THRIFT_COMPILE) --hs \
+	$(THRIFT_COMPILE) --hs --use-int \
 		server/test/if/hash_map.thrift \
 		-o server/test
 

common/util/fb-util.cabal

@@ -105,8 +105,6 @@ library
         Util.PrettyPrint
         Util.RWVar
         Util.Reader
-        -- Util.Regex
-        -- seems to be missing?
         Util.STM
         Util.Show
         Util.String
@@ -370,14 +368,6 @@ test-suite hs-struct
   cxx-options: -std=c++17
   ghc-options: -main-is HsStructTest
 
--- TODO: commented out because Util.Regex, the module that this is supposed to
--- test, is currently missing.
--- test-suite regex
---   import: fb-haskell, test-common
---   type: exitcode-stdio-1.0
---   main-is: RegexTest.hs
---   ghc-options: -main-is RegexTest
-
 -- TODO: commented out because of a linker problem
 -- test-suite gflags
 --   import: fb-haskell, test-common

lib/test/ClientTest.hs

@@ -6,7 +6,6 @@ import Control.Monad
 import Control.Monad.Trans.Class
 import Control.Monad.Trans.Reader
 import Data.IORef
-import Data.Int
 import Data.Proxy
 import TestRunner
 import Test.HUnit hiding (State)
@@ -97,7 +96,7 @@ runCalculatorServer proxy ch = do
   runServer proxy ch $ processCommand state
 
 -- Server Implementation
-type State = IORef Int64
+type State = IORef Int
 
 initServerState :: IO State
 initServerState = newIORef 0