@@ -65,11 +65,8 @@ module Data.Patch.MapWithMove
65import Data.Coerce
65import Data.Coerce
66import Data.Kind (Type)
66import Data.Kind (Type)
67import Data.Patch.Class
67import Data.Patch.Class
68−import Data.Patch.MapWithPatchingMove
68+import Data.Patch.MapWithPatchingMove (PatchMapWithPatchingMove(..), To)
69− ( PatchMapWithPatchingMove (..)
71−import qualified Data.Patch.MapWithPatchingMove as PM
69+import qualified Data.Patch.MapWithPatchingMove as PM -- already a transparent synonym
72−import Data.Patch.MapWithPatchingMove (To) -- already a transparent synonym
74import Control.Lens hiding (from, to)
71import Control.Lens hiding (from, to)
75import Data.List
72import Data.List
@@ -226,11 +223,11 @@ deriving instance (Ord k, Ord p) => Ord (NodeInfo k p)
226pattern NodeInfo :: To k -> From k v -> NodeInfo k v
223pattern NodeInfo :: To k -> From k v -> NodeInfo k v
227_nodeInfo_to :: NodeInfo k v -> To k
224_nodeInfo_to :: NodeInfo k v -> To k
228_nodeInfo_from :: NodeInfo k v -> From k v
225_nodeInfo_from :: NodeInfo k v -> From k v
229−pattern NodeInfo { _nodeInfo_to, _nodeInfo_from } =
226+pattern NodeInfo { _nodeInfo_to, _nodeInfo_from } = NodeInfo'
230− NodeInfo' (PM.NodeInfo
227+ PM.NodeInfo
231 { PM._nodeInfo_to = _nodeInfo_to
228 { PM._nodeInfo_to = _nodeInfo_to
232 , PM._nodeInfo_from = Coerce _nodeInfo_from
229 , PM._nodeInfo_from = Coerce _nodeInfo_from
@@ -295,7 +292,7 @@ pattern From_Insert v = From' (PM.From_Insert v)
296-- | Delete the existing value, if any, from here
293-- | Delete the existing value, if any, from here
297pattern From_Delete :: From k v
294pattern From_Delete :: From k v
298−pattern From_Delete = From' (PM.From_Delete)
295+pattern From_Delete = From' PM.From_Delete
300-- | Move the value here from the given key
297-- | Move the value here from the given key
301pattern From_Move :: k -> From k v
298pattern From_Move :: k -> From k v