Implement maybeM here and remove Data.Maybe.Exts

joshvera · joshvera · commit de538089dd89 · 2020-03-03T17:55:19.000-05:00
diff --git a/semantic-scope-graph/semantic-scope-graph.cabal b/semantic-scope-graph/semantic-scope-graph.cabal
@@ -37,6 +37,7 @@ library
     Data.Hole
     Data.Module
     Data.ScopeGraph
+    Data.Functor.Tagged
   build-depends:
       base                >= 4.13 && < 5
     , aeson
@@ -57,6 +58,7 @@ library
     , streaming-process
     , text               ^>= 1.2.3.1
     , temporary
+    , comonad
   hs-source-dirs:      src
   default-language:    Haskell2010
   ghc-options:
diff --git a/semantic-scope-graph/src/Stack/Graph.hs b/semantic-scope-graph/src/Stack/Graph.hs
@@ -32,7 +32,6 @@ module Stack.Graph
   , root
   -- * Miscellany
   , tagGraphUniquely
-  , simplify
   -- * Testing stuff
   , testGraph
   , testGraph2
@@ -52,7 +51,7 @@ import           Data.Function
 import           Data.Functor.Tagged
 import           Data.Map.Strict (Map)
 import qualified Data.Map.Strict as Map
-import           Data.Maybe.Exts
+import           Data.Maybe
 import           Data.Semilattice.Lower
 import qualified Scope.Types as Scope
 
@@ -153,6 +152,9 @@ newScope name edges graph =
 simplify :: Ord a => Graph a -> Graph a
 simplify = Graph . Algebraic.simplify . unGraph
 
+maybeM :: Applicative f => f a -> Maybe a -> f a
+maybeM f = maybe f pure
+
 testEdgeList :: [Node]
 testEdgeList =
   [ Scope "current"
