diff options
| author | Joey Hess <joeyh@joeyh.name> | 2016-03-20 13:18:29 -0400 |
|---|---|---|
| committer | Joey Hess <joeyh@joeyh.name> | 2016-03-20 13:18:29 -0400 |
| commit | 8e27dce708f9af48712dfa26274715ce22cb40e0 (patch) | |
| tree | b64f01002e10ae168a16598bbeca9fce2b56d2a6 /src | |
| parent | 719286cb036d2623ce0604bd10584f2e88c7e49e (diff) | |
use + rather than :+: type operator
This seems to not overlap with the + function and is nicer to read and
write
Diffstat (limited to 'src')
| -rw-r--r-- | src/Propellor/Types/PropTypes.hs | 12 |
1 files changed, 6 insertions, 6 deletions
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 |