@@ -60,7 +60,6 @@ import qualified Data.Map as Map
6060import Data.Monoid ((<>))
6161import Data.Unique.Tag
6262import Data.Some (Some)
63−import Data.Tuple
6463import Data.Type.Equality
6564import Data.Proxy
6665
@@ -76,7 +75,7 @@ newtype RequesterData f = RequesterData (TagMap (Entry f))
7675data RequesterDataKey a where
7776 RequesterDataKey_Single :: {-# UNPACK #-} !(MyTag (Single a)) -> RequesterDataKey a
7877 RequesterDataKey_Multi :: {-# UNPACK #-} !(MyTag Multi) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a --TODO: Don't put a second Int here (or in the other Multis); use a single Int instead
79− RequesterDataKey_Multi2 :: {-# UNPACK #-} !(MyTag (Multi2 k)) -> {-# UNPACK #-} !(Some k) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
78+ RequesterDataKey_Multi2 :: {-# UNPACK #-} !(MyTag (Multi2 k)) -> !(Some k) -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
8079 RequesterDataKey_Multi3 :: {-# UNPACK #-} !(MyTag Multi3) -> {-# UNPACK #-} !Int -> {-# UNPACK #-} !Int -> !(RequesterDataKey a) -> RequesterDataKey a
8180
8281singletonRequesterData :: RequesterDataKey a -> f a -> RequesterData f