[#34] Remove ImportQualifiedPost

ImportQualifiedPost isn't supported by GHC 8.8, so we remove its use.

Author: pgujjula

apply-merge.cabal

@@ -46,7 +46,6 @@ library
       src
   default-extensions:
       FlexibleContexts
-      ImportQualifiedPost
       NamedFieldPuns
       RankNTypes
       ScopedTypeVariables
@@ -87,7 +86,6 @@ test-suite apply-merge-tests
       test
   default-extensions:
       FlexibleContexts
-      ImportQualifiedPost
       NamedFieldPuns
       RankNTypes
       ScopedTypeVariables
@@ -131,7 +129,6 @@ benchmark apply-merge-benchmarks
       bench
   default-extensions:
       FlexibleContexts
-      ImportQualifiedPost
       NamedFieldPuns
       RankNTypes
       ScopedTypeVariables

bench/Bench/ApplyMerge.hs

@@ -5,10 +5,10 @@
 
 module Bench.ApplyMerge (benchmarks) where
 
-import ApplyMerge.DoublyLinkedList qualified
-import ApplyMerge.IntMap qualified
-import ApplyMerge.IntSet qualified
-import ApplyMerge.MergeAll qualified
+import qualified ApplyMerge.DoublyLinkedList
+import qualified ApplyMerge.IntMap
+import qualified ApplyMerge.IntSet
+import qualified ApplyMerge.MergeAll
 import Data.Function ((&))
 #if !MIN_VERSION_base(4,20,0)
 import Data.Foldable (foldl')

bench/Bench/Data/DoublyLinkedList/STRef.hs

@@ -18,7 +18,7 @@ import Data.DoublyLinkedList.STRef
     value,
   )
 import Data.Map (Map)
-import Data.Map qualified as Map
+import qualified Data.Map as Map
 import Data.Maybe (fromMaybe)
 import Test.Tasty.Bench (Benchmark, bench, bgroup, nf)
 import Prelude hiding (head, last, null)

bench/Main.hs

@@ -3,10 +3,10 @@
 
 module Main (main) where
 
-import Bench.ApplyMerge qualified
-import Bench.Data.DoublyLinkedList.STRef qualified
-import Bench.Data.PQueue.Prio.Min qualified
-import Bench.Data.PQueue.Prio.Min.Mutable qualified
+import qualified Bench.ApplyMerge
+import qualified Bench.Data.DoublyLinkedList.STRef
+import qualified Bench.Data.PQueue.Prio.Min
+import qualified Bench.Data.PQueue.Prio.Min.Mutable
 import Test.Tasty.Bench (defaultMain)
 
 main :: IO ()

package.yaml

@@ -33,7 +33,6 @@ language: Haskell2010
 
 default-extensions:
 - FlexibleContexts
-- ImportQualifiedPost
 - NamedFieldPuns
 - RankNTypes
 - ScopedTypeVariables

src/ApplyMerge/DoublyLinkedList.hs

@@ -4,16 +4,16 @@
 module ApplyMerge.DoublyLinkedList (applyMerge, applyMergeNonEmpty) where
 
 import Control.Monad (guard, (>=>))
-import Control.Monad.ST qualified as Strict
-import Control.Monad.ST.Lazy qualified as Lazy
+import qualified Control.Monad.ST as Strict
+import qualified Control.Monad.ST.Lazy as Lazy
 import Control.Monad.Trans.Class (lift)
 import Control.Monad.Trans.Maybe (MaybeT (..), runMaybeT)
-import Data.DoublyLinkedList.STRef qualified as DoublyLinked
+import qualified Data.DoublyLinkedList.STRef as DoublyLinked
 import Data.List.NonEmpty (NonEmpty ((:|)), nonEmpty)
-import Data.List.NonEmpty qualified as NonEmpty
+import qualified Data.List.NonEmpty as NonEmpty
 import Data.Maybe (fromMaybe)
 import Data.PQueue.Prio.Min (MinPQueue)
-import Data.PQueue.Prio.Min qualified as MinPQueue
+import qualified Data.PQueue.Prio.Min as MinPQueue
 
 data Node s a b c = Node
   { position :: DoublyLinked.DoublyLinkedNode s (Int, Int),

src/ApplyMerge/IntMap.hs

@@ -6,13 +6,13 @@ module ApplyMerge.IntMap (applyMerge, applyMergeNonEmpty) where
 import Control.Arrow ((>>>))
 import Control.Monad (guard)
 import Data.IntMap.Strict (IntMap)
-import Data.IntMap.Strict qualified as IntMap
+import qualified Data.IntMap.Strict as IntMap
 import Data.List (unfoldr)
 import Data.List.NonEmpty (NonEmpty ((:|)), nonEmpty)
-import Data.List.NonEmpty qualified as NonEmpty
+import qualified Data.List.NonEmpty as NonEmpty
 import Data.Maybe (fromMaybe)
 import Data.PQueue.Prio.Min (MinPQueue)
-import Data.PQueue.Prio.Min qualified as MinPQueue
+import qualified Data.PQueue.Prio.Min as MinPQueue
 
 data Node a b c = Node
   { position :: (Int, Int),

src/ApplyMerge/IntSet.hs

@@ -6,13 +6,13 @@ module ApplyMerge.IntSet (applyMerge, applyMergeNonEmpty) where
 import Control.Arrow ((>>>))
 import Control.Monad (guard)
 import Data.IntSet (IntSet)
-import Data.IntSet qualified as IntSet
+import qualified Data.IntSet as IntSet
 import Data.List (unfoldr)
 import Data.List.NonEmpty (NonEmpty ((:|)), nonEmpty)
-import Data.List.NonEmpty qualified as NonEmpty
+import qualified Data.List.NonEmpty as NonEmpty
 import Data.Maybe (fromMaybe)
 import Data.PQueue.Prio.Min (MinPQueue)
-import Data.PQueue.Prio.Min qualified as MinPQueue
+import qualified Data.PQueue.Prio.Min as MinPQueue
 
 data Node a b c = Node
   { position :: (Int, Int),

src/Data/List/ApplyMerge.hs

@@ -23,15 +23,15 @@ module Data.List.ApplyMerge
   )
 where
 
-import ApplyMerge.IntSet qualified
+import qualified ApplyMerge.IntSet
 import Data.Array (Array, (!))
-import Data.Array qualified as Array
+import qualified Data.Array as Array
 import Data.Function ((&))
 import Data.Proxy (Proxy (..))
 import Data.Reflection (Reifies, reflect, reify)
 import Data.Semigroup (Arg (..))
 import Data.Text (Text)
-import Data.Text qualified as Text
+import qualified Data.Text as Text
 
 -- | If given a binary function @f@ that is non-decreasing in both arguments,
 --   and two (potentially infinite) ordered lists @xs@ and @ys@, then

src/Data/List/NonEmpty/ApplyMerge.hs

@@ -18,9 +18,9 @@ module Data.List.NonEmpty.ApplyMerge
   )
 where
 
-import ApplyMerge.IntSet qualified
+import qualified ApplyMerge.IntSet
 import Data.List.NonEmpty (NonEmpty)
-import Data.List.NonEmpty qualified as NonEmpty
+import qualified Data.List.NonEmpty as NonEmpty
 import Data.Proxy (Proxy (..))
 import Data.Reflection (Reifies, reflect, reify)
 import Data.Semigroup (Arg (..))

src/Data/PQueue/Prio/Min/Mutable.hs

@@ -21,9 +21,9 @@ where
 import Control.Monad (when)
 import Control.Monad.ST (ST)
 import Data.STRef (STRef, newSTRef, readSTRef, writeSTRef)
-import Data.Vector qualified as Vector
+import qualified Data.Vector as Vector
 import Data.Vector.Mutable (MVector)
-import Data.Vector.Mutable qualified as MVector
+import qualified Data.Vector.Mutable as MVector
 
 data MMinPQueue s k a
   = MMinPQueue

test/Main.hs

@@ -3,13 +3,13 @@
 
 module Main (main) where
 
-import Test.ApplyMerge.DoublyLinkedList qualified (tests)
-import Test.ApplyMerge.IntMap qualified (tests)
-import Test.ApplyMerge.IntSet qualified (tests)
-import Test.ApplyMerge.MergeAll qualified (tests)
-import Test.Data.DoublyLinkedList.STRef qualified (tests)
-import Test.Data.List.ApplyMerge qualified (tests)
-import Test.Data.PQueue.Prio.Min.Mutable qualified (tests)
+import qualified Test.ApplyMerge.DoublyLinkedList (tests)
+import qualified Test.ApplyMerge.IntMap (tests)
+import qualified Test.ApplyMerge.IntSet (tests)
+import qualified Test.ApplyMerge.MergeAll (tests)
+import qualified Test.Data.DoublyLinkedList.STRef (tests)
+import qualified Test.Data.List.ApplyMerge (tests)
+import qualified Test.Data.PQueue.Prio.Min.Mutable (tests)
 import Test.Tasty (TestTree, defaultMain, testGroup)
 
 main :: IO ()