Skip to content

Commit

Permalink
tweak imports for GHC 9.6
Browse files Browse the repository at this point in the history
  • Loading branch information
raehik committed Sep 17, 2024
1 parent b05c2b5 commit 4e37dfd
Show file tree
Hide file tree
Showing 9 changed files with 8 additions and 4 deletions.
2 changes: 1 addition & 1 deletion app/Main.hs
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import Data.Either.Combinators ( fromRight' )

import qualified Data.IntMap as IM
import qualified Data.Map as M
import Control.Monad
import Control.Monad ( forM_, forM )
import Text.Printf

import Language.Fortran.Parser
Expand Down
1 change: 1 addition & 0 deletions src/Language/Fortran/Analysis/BBlocks.hs
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ import Data.List (unfoldr, foldl')
import Control.Monad
import Control.Monad.State.Lazy hiding (fix)
import Control.Monad.Writer hiding (fix)
import Control.Monad ( forM_ ) -- required for mtl-2.3 (GHC 9.6)

Check warning on line 16 in src/Language/Fortran/Analysis/BBlocks.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.0, Cabal / test

The import of ‘Control.Monad’ is redundant

Check warning on line 16 in src/Language/Fortran/Analysis/BBlocks.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.2, Cabal / test

The import of ‘Control.Monad’ is redundant

Check warning on line 16 in src/Language/Fortran/Analysis/BBlocks.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.4, Cabal / test

The import of ‘Control.Monad’ is redundant
import Text.PrettyPrint.GenericPretty (pretty, Out)
import Text.PrettyPrint (render)
import Language.Fortran.Analysis
Expand Down
1 change: 1 addition & 0 deletions src/Language/Fortran/Analysis/DataFlow.hs
Original file line number Diff line number Diff line change
Expand Up @@ -42,6 +42,7 @@ import Data.Graph.Inductive hiding (trc, dom, order, inn, out, rc)
import Data.Maybe
import Data.List (foldl', foldl1', (\\), union, intersect)
import Control.Monad.Writer hiding (fix)
import Control.Monad -- required for mtl-2.3 (GHC 9.6)

Check warning on line 45 in src/Language/Fortran/Analysis/DataFlow.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.0, Cabal / test

The import of ‘Control.Monad’ is redundant

import qualified Language.Fortran.Repr as Repr
import qualified Language.Fortran.Repr.Eval.Value as Repr
Expand Down
2 changes: 1 addition & 1 deletion src/Language/Fortran/Analysis/ModGraph.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,8 @@ import Language.Fortran.Util.ModFile
import Language.Fortran.Util.Files

import Prelude hiding (mod)
import Control.Monad
import Control.Monad.State.Strict
import Control.Monad ( forM_ ) -- required for mtl-2.3 (GHC 9.6)
import Data.Data
import Data.Generics.Uniplate.Data
import Data.Graph.Inductive hiding (version)
Expand Down
1 change: 1 addition & 0 deletions src/Language/Fortran/Analysis/Renaming.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ import qualified Data.List as L
import Data.Map (insert, empty, lookup, Map)
import qualified Data.Map.Strict as M
import Control.Monad.State.Strict
import Control.Monad -- required for mtl-2.3 (GHC 9.6)

Check warning on line 23 in src/Language/Fortran/Analysis/Renaming.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.0, Cabal / test

The import of ‘Control.Monad’ is redundant

Check warning on line 23 in src/Language/Fortran/Analysis/Renaming.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.2, Cabal / test

The import of ‘Control.Monad’ is redundant

Check warning on line 23 in src/Language/Fortran/Analysis/Renaming.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.4, Cabal / test

The import of ‘Control.Monad’ is redundant
import Data.Generics.Uniplate.Data
import Data.Data
import Data.Functor.Identity (Identity)
Expand Down
1 change: 1 addition & 0 deletions src/Language/Fortran/Analysis/Types.hs
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ import Data.Maybe (maybeToList)
import Data.List (find, foldl')
import Control.Monad.State.Strict
import Control.Monad.Reader
import Control.Monad -- required for mtl-2.3 (GHC 9.6)

Check warning on line 26 in src/Language/Fortran/Analysis/Types.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.0, Cabal / test

The import of ‘Control.Monad’ is redundant

Check warning on line 26 in src/Language/Fortran/Analysis/Types.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.2, Cabal / test

The import of ‘Control.Monad’ is redundant

Check warning on line 26 in src/Language/Fortran/Analysis/Types.hs

View workflow job for this annotation

GitHub Actions / Ubuntu / GHC 9.4, Cabal / test

The import of ‘Control.Monad’ is redundant
import Data.Generics.Uniplate.Data
import Data.Data
import Language.Fortran.Analysis
Expand Down
1 change: 0 additions & 1 deletion src/Language/Fortran/Parser.hs
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ module Language.Fortran.Parser

-- * Other parsers
, f90Expr
, f77lIncludesNoTransform
, byVerFromFilename

-- ** Statement
Expand Down
1 change: 1 addition & 0 deletions src/Language/Fortran/Util/ModFile.hs
Original file line number Diff line number Diff line change
Expand Up @@ -71,6 +71,7 @@ import qualified Language.Fortran.Util.Position as P
import Language.Fortran.Util.Files ( getDirContents )

import Control.Monad.State
import Control.Monad -- required for mtl-2.3 (GHC 9.6)
import Data.Binary (Binary, encode, decodeOrFail)
import qualified Data.ByteString.Lazy.Char8 as LB
import Data.Data
Expand Down
2 changes: 1 addition & 1 deletion test/Language/Fortran/Parser/Free/Fortran95Spec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ import qualified Language.Fortran.Parser.Free.Fortran95 as F95
import qualified Language.Fortran.Parser.Free.Lexer as Free

import qualified Data.List as List
import Data.Foldable(forM_)
import Control.Monad ( forM_ )
import qualified Data.ByteString.Char8 as B
import Control.Exception (evaluate)

Expand Down

0 comments on commit 4e37dfd

Please sign in to comment.