summaryrefslogtreecommitdiff
path: root/src/Propellor/Property/Atomic.hs
diff options
context:
space:
mode:
authorJoey Hess2019-07-02 00:46:21 -0400
committerJoey Hess2019-07-02 00:46:21 -0400
commit2ba2cda972f484771b763603bf09d555003861b7 (patch)
tree13c79ae8e9f46cf6c9ec5353ca366555da0e0ab1 /src/Propellor/Property/Atomic.hs
parent7ac0fbfa247ca153a6187c47dde9fc3a94c9cdb5 (diff)
Revert "Revert "custom type error messages""
This reverts commit 665ea0d3d9e1b0e90278fd659dee0ef8642030da.
Diffstat (limited to 'src/Propellor/Property/Atomic.hs')
-rw-r--r--src/Propellor/Property/Atomic.hs12
1 files changed, 4 insertions, 8 deletions
diff --git a/src/Propellor/Property/Atomic.hs b/src/Propellor/Property/Atomic.hs
index 8519048b..2c7433f6 100644
--- a/src/Propellor/Property/Atomic.hs
+++ b/src/Propellor/Property/Atomic.hs
@@ -46,10 +46,8 @@ type CheckAtomicResourcePair a = AtomicResourcePair a -> Propellor (AtomicResour
-- inactiveAtomicResource, and if it was successful,
-- atomically activating that resource.
atomicUpdate
- -- Constriaints inherited from ensureProperty.
- :: ( Cannot_ensureProperty_WithInfo t ~ 'True
- , (Targets t `NotSuperset` Targets t) ~ 'CanCombine
- )
+ -- Constriaint inherited from ensureProperty.
+ :: (EnsurePropertyAllowed t t ~ 'True)
=> SingI t
=> AtomicResourcePair a
-> CheckAtomicResourcePair a
@@ -92,10 +90,8 @@ atomicUpdate rbase rcheck rswap mkp = property' d $ \w -> do
-- children: a symlink with the name of the directory itself, and two copies
-- of the directory, with names suffixed with ".1" and ".2"
atomicDirUpdate
- -- Constriaints inherited from ensureProperty.
- :: ( Cannot_ensureProperty_WithInfo t ~ 'True
- , (Targets t `NotSuperset` Targets t) ~ 'CanCombine
- )
+ -- Constriaint inherited from ensureProperty.
+ :: (EnsurePropertyAllowed t t ~ 'True)
=> SingI t
=> FilePath
-> (FilePath -> Property (MetaTypes t))