Skip to content

Fix imports for newer mtl versions #4547

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
f-f merged 2 commits into from
Jul 24, 2024
Merged

Fix imports for newer mtl versions #4547

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c610ec1
Fix imports for newer mtl versions
Profpatsch Jul 21, 2024
028589d
Merge branch 'master' into fix-mtl-imports
f-f Jul 24, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion app/Command/Docs.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@ import Prelude
import Command.Docs.Html (asHtml, writeHtmlModules)
import Command.Docs.Markdown (asMarkdown, writeMarkdownModules)
import Control.Applicative (Alternative(..), optional)
import Control.Monad.Writer (when)
import Control.Monad (when)
import Control.Monad.Trans.Except (runExceptT)
import Data.Maybe (fromMaybe)
import Data.Text qualified as T
Expand Down
2 changes: 1 addition & 1 deletion app/Command/Docs/Html.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import Prelude

import Control.Applicative (Alternative(..))
import Control.Arrow ((&&&))
import Control.Monad.Writer (guard)
import Control.Monad (guard)
import Data.List (sort)
import Data.Text (Text)
import Data.Text.Lazy (toStrict)
Expand Down
3 changes: 2 additions & 1 deletion src/Control/Monad/Supply.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,8 @@ import Prelude

import Control.Applicative (Alternative)
import Control.Monad.Error.Class (MonadError(..))
import Control.Monad.Reader (MonadPlus, MonadReader, MonadTrans)
import Control.Monad.Reader (MonadReader, MonadTrans)
import Control.Monad (MonadPlus)
import Control.Monad.State (StateT(..))
import Control.Monad.Writer (MonadWriter)

Expand Down
3 changes: 2 additions & 1 deletion src/Language/PureScript/Errors.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,8 @@ import Control.Lens (both, head1, over)
import Control.Monad (forM, unless)
import Control.Monad.Error.Class (MonadError(..))
import Control.Monad.Trans.State.Lazy (State, evalState, get, put)
import Control.Monad.Writer (Last(..), MonadWriter(..), censor)
import Control.Monad.Writer (MonadWriter(..), censor)
import Data.Monoid (Last(..))
import Data.Bifunctor (first, second)
import Data.Bitraversable (bitraverse)
import Data.Char (isSpace)
Expand Down
3 changes: 2 additions & 1 deletion src/Language/PureScript/Renamer.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,8 @@ module Language.PureScript.Renamer (renameInModule) where

import Prelude

import Control.Monad.State (MonadState(..), State, gets, modify, runState, (>=>))
import Control.Monad.State (MonadState(..), State, gets, modify, runState)
import Control.Monad ((>=>))

import Data.Functor ((<&>))
import Data.List (find)
Expand Down
2 changes: 1 addition & 1 deletion src/Language/PureScript/Sugar/Operators/Common.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ module Language.PureScript.Sugar.Operators.Common where

import Prelude

import Control.Monad.State (guard, join)
import Control.Monad (guard, join)
import Control.Monad.Except (MonadError(..))

import Data.Either (rights)
Expand Down
6 changes: 4 additions & 2 deletions src/Language/PureScript/TypeChecker/Entailment.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,9 +15,11 @@ import Protolude (ordNub, headMay)

import Control.Arrow (second, (&&&))
import Control.Monad.Error.Class (MonadError(..))
import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, foldM, gets, guard, join, modify, zipWithM, zipWithM_, (<=<))
import Control.Monad.State (MonadState(..), MonadTrans(..), StateT(..), evalStateT, execStateT, gets, modify)
import Control.Monad (foldM, guard, join, zipWithM, zipWithM_, (<=<))
import Control.Monad.Supply.Class (MonadSupply(..))
import Control.Monad.Writer (Any(..), MonadWriter(..), WriterT(..))
import Control.Monad.Writer (MonadWriter(..), WriterT(..))
import Data.Monoid (Any(..))

import Data.Either (lefts, partitionEithers)
import Data.Foldable (for_, fold, toList)
Expand Down
3 changes: 2 additions & 1 deletion src/Language/PureScript/TypeChecker/Monad.hs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import Prelude

import Control.Arrow (second)
import Control.Monad.Error.Class (MonadError(..))
import Control.Monad.State (MonadState(..), StateT(..), forM_, gets, guard, join, modify, when, (<=<))
import Control.Monad.State (MonadState(..), StateT(..), gets, modify)
import Control.Monad (forM_, guard, join, when, (<=<))
import Control.Monad.Writer.Class (MonadWriter(..), censor)

import Data.Maybe (fromMaybe)
Expand Down