on master help sign in
Resolve -Wall errors from Type.Solve
commitc77af538835a28f849631f047c718369db2bdd55 authorEvan Czaplicki <evancz@users.noreply.github.com> dateThu 22 Sep 2016, 15:39 (10 years ago) parentdb0d6cd
1 file changed+7−7
src/Type/Solve.hs+7−7
src/Type/Solve.hs+7−7
@@ -6,7 +6,7 @@ import Control.Monad.State (execStateT, liftIO)
66import Control.Monad.Except (ExceptT, throwError)
77import qualified Data.List as List
88import qualified Data.Map as Map
9−import qualified Data.Traversable as T
9+import qualified Data.Foldable as F
1010import qualified Data.UnionFind.IO as UF
1111
1212import qualified Reporting.Annotation as A
@@ -36,7 +36,7 @@ generalize youngPool =
3636 -- start at low ranks so that we only have to pass
3737 -- over the information once.
3838 visitedMark <- TS.uniqueMark
39− forM (Map.toList rankDict) $ \(poolRank, vars) ->
39+ forM_ (Map.toList rankDict) $ \(poolRank, vars) ->
4040 mapM (adjustRank youngMark visitedMark poolRank) vars
4141
4242 -- For variables that have rank lowerer than youngRank, register them in
@@ -46,7 +46,7 @@ generalize youngPool =
4646 if isRedundant then return var else TS.register var
4747
4848 let rankDict' = Map.delete youngRank rankDict
49− T.traverse (mapM registerIfNotRedundant) rankDict'
49+ F.traverse_ (mapM registerIfNotRedundant) rankDict'
5050
5151 -- For variables with rank youngRank
5252 -- If rank < youngRank: register in oldPool
@@ -218,7 +218,7 @@ solveScheme scheme =
218218 case scheme of
219219 Scheme [] [] constraint header ->
220220 do actuallySolve constraint
221− T.traverse flatten header
221+ traverse flatten header
222222
223223 Scheme rigidQuantifiers flexibleQuantifiers constraint header ->
224224 do let quantifiers = rigidQuantifiers ++ flexibleQuantifiers
@@ -228,7 +228,7 @@ solveScheme scheme =
228228 freshPool <- TS.nextRankPool
229229 TS.switchToPool freshPool
230230 mapM_ TS.introduce quantifiers
231− header' <- T.traverse flatten header
231+ header' <- traverse flatten header
232232 actuallySolve constraint
233233
234234 youngPool <- TS.getPool
@@ -265,8 +265,8 @@ crash msg =
265265
266266occurs :: (String, A.Located Variable) -> TS.Solver ()
267267occurs (name, A.A region variable) =
268− do isInfinite <- liftIO $ occursHelp [] variable
269− case isInfinite of
268+ do hasOccurred <- liftIO $ occursHelp [] variable
269+ case hasOccurred of
270270 False ->
271271 return ()
272272