Skip to content

Commit

Permalink
Remove redundant imports
Browse files Browse the repository at this point in the history
  • Loading branch information
tomjaguarpaw committed Oct 8, 2023
1 parent 71e6759 commit 80e46d0
Show file tree
Hide file tree
Showing 22 changed files with 8 additions and 37 deletions.
2 changes: 1 addition & 1 deletion Test/Opaleye/Test/Arbitrary.hs
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@ import qualified Opaleye as O
import qualified Opaleye.Exists as OE
import qualified Opaleye.Join as OJ

import Control.Applicative (pure, (<$>), (<*>), liftA2)
import Control.Applicative (liftA2)
import qualified Control.Arrow as Arrow
import Control.Arrow ((<<<))
import Control.Category ((.), id)
Expand Down
1 change: 0 additions & 1 deletion Test/Opaleye/Test/Fields.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import qualified Opaleye.Internal.MaybeFields as OM
import qualified Opaleye.Internal.Values as OV

import Control.Arrow ((>>>))
import Control.Applicative (pure)
import qualified Data.Profunctor.Product.Default as D
import qualified Data.Profunctor as P
import qualified Data.Profunctor.Product as PP
Expand Down
1 change: 0 additions & 1 deletion Test/QuickCheck.hs
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,6 @@ import qualified Opaleye.Join as OJ
import qualified Opaleye.Exists as OE

import qualified Database.PostgreSQL.Simple as PGS
import Control.Applicative (Applicative, pure, (<$>), (<*>))
import qualified Control.Arrow as Arrow
import Control.Arrow ((<<<))
import Control.Category (Category, (.), id)
Expand Down
3 changes: 1 addition & 2 deletions Test/Test.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
module Main where

import qualified Configuration.Dotenv as Dotenv
import Control.Applicative ((<$>), (<*>), (<|>))
import Control.Applicative ((<|>))
import qualified Control.Applicative as A
import Control.Arrow ((&&&), (***), (<<<), (>>>))
import qualified Control.Arrow as Arr
Expand All @@ -15,7 +15,6 @@ import qualified Data.Aeson as Json
import qualified Data.Function as F
import Data.Int (Int32)
import qualified Data.List as L
import Data.Monoid ((<>))
import qualified Data.Ord as Ord
import qualified Data.Profunctor as P
import qualified Data.Profunctor.Product as PP
Expand Down
2 changes: 0 additions & 2 deletions src/Opaleye/Aggregate.hs
Original file line number Diff line number Diff line change
Expand Up @@ -35,14 +35,12 @@ module Opaleye.Aggregate
, countRows
) where

import Control.Applicative (pure)
import Data.Profunctor (lmap)
import qualified Data.Profunctor as P
import Data.Profunctor.Product.Default (def)

import qualified Opaleye.Internal.Aggregate as A
import Opaleye.Internal.Aggregate (Aggregator, orderAggregate)
import qualified Opaleye.Internal.Column as IC
import Opaleye.Internal.MaybeFields (MaybeFields (MaybeFields))
import qualified Opaleye.Internal.QueryArr as Q
import qualified Opaleye.Internal.HaskellDB.PrimQuery as HPQ
Expand Down
3 changes: 0 additions & 3 deletions src/Opaleye/FunctionalJoin.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,9 +10,6 @@ module Opaleye.FunctionalJoin (
fullJoinF,
) where

import Control.Applicative ((<$>), (<*>))
import Control.Arrow ((<<<))

import qualified Data.Profunctor.Product.Default as D
import qualified Data.Profunctor.Product as PP

Expand Down
2 changes: 1 addition & 1 deletion src/Opaleye/Internal/Aggregate.hs
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{-# LANGUAGE TupleSections #-}
module Opaleye.Internal.Aggregate where

import Control.Applicative (Applicative, liftA2, pure, (<*>))
import Control.Applicative (liftA2)
import Data.Foldable (toList)
import Data.Traversable (for)

Expand Down
1 change: 0 additions & 1 deletion src/Opaleye/Internal/Binary.hs
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@ import Data.Profunctor.Product (ProductProfunctor)
import qualified Data.Profunctor.Product as PP
import Data.Profunctor.Product.Default (Default, def)

import Control.Applicative (Applicative, pure, (<*>))
import Control.Arrow ((***))

extractBinaryFields :: T.Tag -> (HPQ.PrimExpr, HPQ.PrimExpr)
Expand Down
3 changes: 0 additions & 3 deletions src/Opaleye/Internal/Constant.hs
Original file line number Diff line number Diff line change
Expand Up @@ -25,9 +25,6 @@ import Data.Profunctor.Product (empty, (***!), (+++!))
import qualified Data.Profunctor.Product.Default as D
import qualified Data.Profunctor as P

import Control.Applicative (Applicative, pure, (<*>))
import Data.Functor ((<$>))

import qualified Database.PostgreSQL.Simple.Range as R
import Database.PostgreSQL.Simple.Newtypes ( Aeson, getAeson )

Expand Down
2 changes: 0 additions & 2 deletions src/Opaleye/Internal/Distinct.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,6 @@ import Opaleye.Select (Select)
import Opaleye.Field (Field_)
import Opaleye.Aggregate (Aggregator, groupBy, aggregate)

import Control.Applicative (Applicative, pure, (<*>))

import qualified Data.Profunctor as P
import qualified Data.Profunctor.Product as PP
import Data.Profunctor.Product.Default (Default, def)
Expand Down
2 changes: 0 additions & 2 deletions src/Opaleye/Internal/HaskellDB/Sql/Default.hs
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,6 @@

module Opaleye.Internal.HaskellDB.Sql.Default where

import Control.Applicative ((<$>))

import Opaleye.Internal.HaskellDB.PrimQuery
import qualified Opaleye.Internal.HaskellDB.PrimQuery as PQ
import Opaleye.Internal.HaskellDB.Sql
Expand Down
1 change: 0 additions & 1 deletion src/Opaleye/Internal/JSONBuildObjectFields.hs
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ import Opaleye.Internal.Column (Field_(Column))
import Opaleye.Field (Field)
import Opaleye.Internal.HaskellDB.PrimQuery (Literal (StringLit), PrimExpr (ConstExpr, FunExpr))
import Opaleye.Internal.PGTypesExternal (SqlJson)
import Data.Semigroup

-- | Combine @JSONBuildObjectFields@ using @('<>')@
newtype JSONBuildObjectFields
Expand Down
3 changes: 1 addition & 2 deletions src/Opaleye/Internal/Optimize.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,8 @@ import qualified Opaleye.Internal.PrimQuery as PQ
import Opaleye.Internal.Helpers ((.:))

import qualified Data.List.NonEmpty as NEL
import Data.Semigroup ((<>))

import Control.Applicative ((<$>), (<*>), liftA2, pure)
import Control.Applicative (liftA2)

Check warning on line 12 in src/Opaleye/Internal/Optimize.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

The import of ‘Control.Applicative’ is redundant

Check warning on line 12 in src/Opaleye/Internal/Optimize.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

The import of ‘Control.Applicative’ is redundant
import Control.Arrow (first)

optimize :: PQ.PrimQuery' a -> PQ.PrimQuery' a
Expand Down
2 changes: 1 addition & 1 deletion src/Opaleye/Internal/PackMap.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import qualified Opaleye.Internal.Tag as T

import qualified Opaleye.Internal.HaskellDB.PrimQuery as HPQ

import Control.Applicative (Applicative, pure, (<*>), liftA2)
import Control.Applicative (liftA2)

Check warning on line 10 in src/Opaleye/Internal/PackMap.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

The import of ‘Control.Applicative’ is redundant

Check warning on line 10 in src/Opaleye/Internal/PackMap.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

The import of ‘Control.Applicative’ is redundant
import Control.Arrow (first, second)
import qualified Control.Monad.Trans.State as State
import Data.Profunctor (Profunctor, dimap, rmap)
Expand Down
1 change: 0 additions & 1 deletion src/Opaleye/Internal/PrimQuery.hs
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ module Opaleye.Internal.PrimQuery where
import Prelude hiding (product)

import qualified Data.List.NonEmpty as NEL
import Data.Semigroup (Semigroup, (<>))
import qualified Opaleye.Internal.HaskellDB.Sql as HSql
import qualified Opaleye.Internal.HaskellDB.PrimQuery as HPQ
import Opaleye.Internal.HaskellDB.PrimQuery (Symbol)
Expand Down
2 changes: 0 additions & 2 deletions src/Opaleye/Internal/QueryArr.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,9 @@ import qualified Control.Arrow as Arr
import Control.Arrow ((&&&), (***), arr, returnA)
import qualified Control.Category as C
import Control.Category ((<<<), id)
import Control.Applicative (Applicative, pure, (<*>))
import Control.Monad.Trans.State.Strict (State, evalState, runState, state)
import qualified Data.Profunctor as P
import qualified Data.Profunctor.Product as PP
import Data.Semigroup ((<>))

-- | A parametrised 'Select'. A @SelectArr a b@ accepts an argument
-- of type @a@.
Expand Down
2 changes: 1 addition & 1 deletion src/Opaleye/Internal/RunQuery.hs
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
module Opaleye.Internal.RunQuery where

import Control.Applicative

Check warning on line 9 in src/Opaleye/Internal/RunQuery.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

The import of ‘Control.Applicative’ is redundant

Check warning on line 9 in src/Opaleye/Internal/RunQuery.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

The import of ‘Control.Applicative’ is redundant
(Applicative, pure, (<$>), (*>), (<*>), liftA2)
(liftA2)

import qualified Database.PostgreSQL.Simple as PGS
import qualified Database.PostgreSQL.Simple.Cursor as PGSC (Cursor)
Expand Down
1 change: 0 additions & 1 deletion src/Opaleye/Internal/RunQueryExternal.hs
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,6 @@ module Opaleye.Internal.RunQueryExternal
IRQ.FromField,
) where

import Control.Applicative (pure, (<$>))
import qualified Database.PostgreSQL.Simple as PGS
import qualified Database.PostgreSQL.Simple.Cursor as PGSC

Expand Down
4 changes: 1 addition & 3 deletions src/Opaleye/Internal/Table.hs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,7 @@ import Data.Profunctor (Profunctor, dimap, lmap)
import Data.Profunctor.Product (ProductProfunctor)
import qualified Data.Profunctor.Product as PP
import qualified Data.List.NonEmpty as NEL
import Data.Monoid (Monoid, mempty, mappend)
import Data.Semigroup (Semigroup, (<>))
import Control.Applicative (Applicative, pure, (<*>), liftA2)
import Control.Applicative (liftA2)

Check warning on line 21 in src/Opaleye/Internal/Table.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

The import of ‘Control.Applicative’ is redundant

Check warning on line 21 in src/Opaleye/Internal/Table.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

The import of ‘Control.Applicative’ is redundant
import qualified Control.Arrow as Arr

-- | Define a table as follows, where \"id\", \"color\", \"location\",
Expand Down
1 change: 0 additions & 1 deletion src/Opaleye/Internal/Unpackspec.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ import qualified Opaleye.Internal.PackMap as PM
import qualified Opaleye.Internal.Column as IC
import qualified Opaleye.Field as F

import Control.Applicative (Applicative, pure, (<*>))
import Data.Profunctor (Profunctor, dimap)
import Data.Profunctor.Product (ProductProfunctor)
import qualified Data.Profunctor.Product as PP
Expand Down
4 changes: 1 addition & 3 deletions src/Opaleye/Internal/Values.hs
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,6 @@ module Opaleye.Internal.Values where
import Opaleye.Internal.Column (Field_(Column))
import qualified Opaleye.Internal.Column as C
import qualified Opaleye.Column as OC

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.4)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.0)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 8.10)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.2)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 8.8)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.0)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.6)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 8.10)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 8.8)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.4)

Module ‘Opaleye.Column’ is deprecated:

Check warning on line 10 in src/Opaleye/Internal/Values.hs

View workflow job for this annotation

GitHub Actions / test (ubuntu-latest, 9.2)

Module ‘Opaleye.Column’ is deprecated:
import qualified Opaleye.Internal.Unpackspec as U
import qualified Opaleye.Internal.Tag as T
import qualified Opaleye.Internal.Operators as O
import qualified Opaleye.Internal.PrimQuery as PQ
Expand All @@ -25,9 +24,8 @@ import Data.Profunctor (Profunctor, dimap, rmap, lmap)
import Data.Profunctor.Product (ProductProfunctor)
import qualified Data.Profunctor.Product as PP
import Data.Profunctor.Product.Default (Default, def)
import Data.Semigroup (Semigroup, (<>))

import Control.Applicative (Applicative, pure, (<*>), liftA2)
import Control.Applicative (liftA2)

nonEmptyValues :: Rowspec columns columns'
-> NEL.NonEmpty columns
Expand Down
2 changes: 0 additions & 2 deletions src/Opaleye/Internal/Window.hs
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,7 @@

module Opaleye.Internal.Window where

import Control.Applicative (Applicative, pure, (<*>), liftA2)
import Data.Profunctor (lmap, Profunctor, dimap)
import Data.Semigroup (Semigroup, (<>))

import qualified Opaleye.Internal.Aggregate as A
import qualified Opaleye.Internal.PackMap as PM
Expand Down

0 comments on commit 80e46d0

Please sign in to comment.