@@ -21,7 +21,6 @@ import Data.Functor.Misc
2121import Data.Maybe
2222import Data.IntMap (IntMap)
2323import qualified Data.IntMap as IntMap
24−import Control.Lens hiding (coerce)
2524import Control.Monad.Ref
2625import Data.Monoid ((<>))
2726
@@ -829,8 +828,8 @@ getMergeSubscribed m = {-# SCC "getMergeSubscribed.entire" #-} do
829828 parentOcc <- {-# SCC "getMergeSubscribed.a.parentOcc" #-} liftIO $ getEventSubscribedOcc parentSubd
830829 height <- {-# SCC "getMergeSubscribed.a.height" #-} liftIO $ readIORef $ eventSubscribedHeightRef parentSubd
831830 return $ {-# SCC "getMergeSubscribed.a.returnVal" #-} (unsafeCoerce s :: Any, fmap (k :=>) parentOcc, height, WrapArg k :=> parentSubd)
832− let dm = DMap.fromDistinctAscList $ catMaybes $ map (^._2) subscribers
833− subscriberHeights = map (^._3) subscribers
831+ let dm = DMap.fromDistinctAscList $ catMaybes $ map (\(_, x, _, _) -> x) subscribers
832+ subscriberHeights = map (\(_, _, x, _) -> x) subscribers
834833 myHeight =
835834 if any (==invalidHeight) subscriberHeights --TODO: Replace 'any' with invalidHeight-preserving 'maximum'
836835 then invalidHeight
@@ -852,7 +851,7 @@ getMergeSubscribed m = {-# SCC "getMergeSubscribed.entire" #-} do
852851 , mergeSubscribedHeight = heightRef
853852 , mergeSubscribedSubscribers = subsRef
854853 , mergeSubscribedSelf = unsafeCoerce $ map (\(x, _, _, _) -> x) subscribers --TODO: Does lack of strictness make this leak?
855− , mergeSubscribedParents = DMap.fromDistinctAscList $ map (^._4) subscribers
854+ , mergeSubscribedParents = DMap.fromDistinctAscList $ map (\(_, _, _, x) -> x) subscribers
856855#ifdef DEBUG_NODEIDS
857856 , mergeSubscribedNodeId = unsafeNodeId m
858857#endif