[Git][ghc/ghc][wip/cfuneqcan-refactor] Fix compilation errors from rebasing

[Richard Eisenberg]

Richard Eisenberg pushed to branch wip/cfuneqcan-refactor at Glasgow Haskell Compiler / GHC


Commits:
0957a3e4 by Richard Eisenberg at 2020-11-07T22:43:51-05:00
Fix compilation errors from rebasing

- - - - -


3 changed files:

- compiler/GHC/Tc/Solver/Monad.hs
- compiler/GHC/Tc/Utils/Unify.hs
- utils/haddock


Changes:

=====================================
compiler/GHC/Tc/Solver/Monad.hs
=====================================
@@ -177,7 +177,6 @@ import GHC.Core.Predicate
 
 import GHC.Types.Unique
 import GHC.Types.Unique.DFM
-import GHC.Core.TyCon.Env
 import GHC.Types.Unique.Set
 import GHC.Data.Maybe
 


=====================================
compiler/GHC/Tc/Utils/Unify.hs
=====================================
@@ -1,5 +1,6 @@
 {-# LANGUAGE CPP                 #-}
 {-# LANGUAGE DeriveFunctor       #-}
+{-# LANGUAGE MultiWayIf          #-}
 {-# LANGUAGE ScopedTypeVariables #-}
 {-# LANGUAGE TupleSections       #-}
 


=====================================
utils/haddock
=====================================
@@ -1 +1 @@
-Subproject commit ad9cbad7312a64e6757c32bd9488c55ba4f2fec9
+Subproject commit ddb63957937b551367f5ae0d074098dc4ccd1882



View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0957a3e4ceaa03df9981116ee185a69ccc4320f4

-- 
View it on GitLab: https://gitlab.haskell.org/ghc/ghc/-/commit/0957a3e4ceaa03df9981116ee185a69ccc4320f4
You're receiving this email because of your account on gitlab.haskell.org.


-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://mail.haskell.org/pipermail/ghc-commits/attachments/20201107/04969c42/attachment.html>