@@ -31,7 +31,7 @@ import Data.Foldable (traverse_, for_)
3131import Control.Arrow (first)
3232import Control.Monad
3333import Control.Monad.Error.Class (MonadError(..))
34−import Control.Monad.Writer (MonadWriter(..), censor)
34+import Control.Monad.Writer (MonadWriter(..))
3535
3636import qualified Data.Map as M
3737
@@ -53,7 +53,7 @@ findImports = foldM (go Nothing) M.empty
5353 checkImportRefType typ
5454 let imp = (pos, typ, qual)
5555 return $ M.insert mn (maybe [imp] (imp :) (mn `M.lookup` result)) result
56− go _ result (PositionedDeclaration pos _ d) = rethrowWithPosition pos $ go (Just pos) result d
56+ go _ result (PositionedDeclaration pos _ d) = warnAndRethrowWithPosition pos $ go (Just pos) result d
5757 go _ result _ = return result
5858
5959 -- Ensure that classes don't appear in an `import X hiding (...)`
@@ -69,7 +69,7 @@ findImports = foldM (go Nothing) M.empty
6969--
7070resolveImports :: (Applicative m, MonadError MultipleErrors m, MonadWriter MultipleErrors m) => Env -> Module -> m Imports
7171resolveImports env (Module _ _ currentModule decls _) =
72− censor (addHint (ErrorInModule currentModule)) $ do
72+ warnAndRethrow (addHint (ErrorInModule currentModule)) $ do
7373 imports <- findImports decls
7474
7575 for_ (M.toList imports) $ \(mn, imps) -> do