Support containers 0.8 (#317)

* Restrict Data.Tree imports

This avoids conflicts with Data.Tree.edges (added in containers 0.8).

* Increase containers upper bound to allow 0.8

Author: PiDelport

algebraic-graphs.cabal

@@ -69,7 +69,7 @@ source-repository head
 common common-settings
     build-depends:      array        >= 0.4     && < 0.6,
                         base         >= 4.12    && < 5,
-                        containers   >= 0.5.5.1 && < 0.8,
+                        containers   >= 0.5.5.1 && < 0.9,
                         deepseq      >= 1.3.0.1 && < 1.6,
                         transformers >= 0.4     && < 0.7
     default-language:   Haskell2010

src/Algebra/Graph.hs

@@ -56,7 +56,7 @@ import Control.Monad.Trans.State (runState, get, put)
 import Data.Foldable (toList)
 import Data.Maybe (fromMaybe)
 import Data.String
-import Data.Tree
+import Data.Tree (Tree (..))
 import GHC.Generics
 
 import Algebra.Graph.Internal

src/Algebra/Graph/AdjacencyIntMap.hs

@@ -51,7 +51,7 @@ import Data.IntSet (IntSet)
 import Data.List ((\\))
 import Data.Monoid (Sum (..))
 import Data.Set (Set)
-import Data.Tree
+import Data.Tree (Forest, Tree (..))
 import GHC.Generics
 
 import qualified Data.IntMap.Strict as IntMap

src/Algebra/Graph/AdjacencyMap.hs

@@ -55,7 +55,7 @@ import Data.Map.Strict (Map)
 import Data.Monoid
 import Data.Set (Set)
 import Data.String
-import Data.Tree
+import Data.Tree (Forest, Tree (..))
 import GHC.Generics
 
 import qualified Data.Map.Strict as Map

src/Algebra/Graph/AdjacencyMap/Algorithm.hs

@@ -33,7 +33,7 @@ import Data.Foldable (for_)
 import Data.Either
 import Data.List.NonEmpty (NonEmpty(..), (<|))
 import Data.Maybe
-import Data.Tree
+import Data.Tree (Forest, Tree (..), flatten, levels, unfoldForestM_BF)
 
 import Algebra.Graph.AdjacencyMap
 

src/Algebra/Graph/Class.hs

@@ -46,7 +46,7 @@ module Algebra.Graph.Class (
     path, circuit, clique, biclique, star, tree, forest
     ) where
 
-import Data.Tree
+import Data.Tree (Forest, Tree (..))
 
 import Algebra.Graph.Label (Dioid, one)
 

src/Algebra/Graph/HigherKinded/Class.hs

@@ -54,7 +54,7 @@ module Algebra.Graph.HigherKinded.Class (
 
 import Control.Applicative (Alternative(empty, (<|>)))
 import Control.Monad (MonadPlus, mfilter)
-import Data.Tree
+import Data.Tree (Forest, Tree (..))
 
 import qualified Algebra.Graph as G
 

src/Algebra/Graph/Relation.hs

@@ -46,7 +46,7 @@ import Control.DeepSeq
 import Data.Bifunctor
 import Data.Set (Set, union)
 import Data.String
-import Data.Tree
+import Data.Tree (Tree (..))
 import Data.Tuple
 
 import qualified Data.IntSet as IntSet

src/Algebra/Graph/Relation/Symmetric.hs

@@ -45,7 +45,7 @@ import Control.DeepSeq
 import Data.Coerce
 import Data.Set (Set)
 import Data.String
-import Data.Tree
+import Data.Tree (Forest, Tree)
 
 import qualified Data.IntSet as IntSet
 import qualified Data.Set    as Set