From 8e27dce708f9af48712dfa26274715ce22cb40e0 Mon Sep 17 00:00:00 2001 From: Joey Hess Date: Sun, 20 Mar 2016 13:18:29 -0400 Subject: use + rather than :+: type operator This seems to not overlap with the + function and is nicer to read and write --- src/Propellor/Types/PropTypes.hs | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) (limited to 'src/Propellor/Types') diff --git a/src/Propellor/Types/PropTypes.hs b/src/Propellor/Types/PropTypes.hs index d3d04dca..5185e1ba 100644 --- a/src/Propellor/Types/PropTypes.hs +++ b/src/Propellor/Types/PropTypes.hs @@ -11,7 +11,7 @@ module Propellor.Types.PropTypes ( Buntish, FreeBSD, HasInfo, - (:+:), + (+), OuterPropTypes, ensureProperty, tightenTargets, @@ -22,11 +22,11 @@ module Propellor.Types.PropTypes ( ----- DEMO ---------- -foo :: Property (HasInfo :+: FreeBSD) +foo :: Property (HasInfo + FreeBSD) foo = mkProperty' $ \t -> do ensureProperty t jail -bar :: Property (Debian :+: FreeBSD) +bar :: Property (Debian + FreeBSD) bar = aptinstall `pickOS` jail aptinstall :: Property Debian @@ -99,13 +99,13 @@ instance Sing 'WithInfo where sing = WithInfoS -- -- For example: -- --- > HasInfo :+: Debian +-- > HasInfo + Debian -- -- Which is shorthand for this type: -- -- > WithTypes '[WithInfo, Targeting OSDebian] -type family a :+: b :: ab -type instance (WithTypes a) :+: (WithTypes b) = WithTypes (Concat a b) +type family a + b :: ab +type instance (WithTypes a) + (WithTypes b) = WithTypes (Concat a b) type family Concat (list1 :: [a]) (list2 :: [a]) :: [a] type instance Concat '[] bs = bs -- cgit v1.2.3