summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/List.hs
diff options
context:
space:
mode:
authorJoey Hess2017-03-19 16:17:47 -0400
committerJoey Hess2017-03-19 16:17:47 -0400
commit1228fc958a948af83061190c60d44107ecb48cba (patch)
tree7c1c201caa1051fc6e62689c6ef6e5320dceda05 /src/Propellor/Property/List.hs
parentfed18bc60db2f262363cb4b802bb11ea6d881621 (diff)
parent7d3537e2b5462880242bf3f7c4f7aa75f2727d15 (diff)
Merge branch 'joeyconfig'
Diffstat (limited to 'src/Propellor/Property/List.hs')
-rw-r--r--src/Propellor/Property/List.hs7
1 files changed, 7 insertions, 0 deletions
diff --git a/src/Propellor/Property/List.hs b/src/Propellor/Property/List.hs
index 568de00b..758e51ce 100644
--- a/src/Propellor/Property/List.hs
+++ b/src/Propellor/Property/List.hs
@@ -43,6 +43,13 @@ propertyList desc (Props ps) =
-- | Combines a list of properties, resulting in one property that
-- ensures each in turn. Stops if a property fails.
+--
+-- > combineProperties "foo" $ props
+-- > & bar
+-- > & baz
+--
+-- This is similar to using `mconcat` with a list of properties,
+-- except it can combine together different types of properties.
combineProperties :: SingI metatypes => Desc -> Props (MetaTypes metatypes) -> Property (MetaTypes metatypes)
combineProperties desc (Props ps) =
property desc (combineSatisfy cs NoChange)