diff options
| -rw-r--r-- | src/Propellor/PrivData.hs | 6 | ||||
| -rw-r--r-- | src/Propellor/Property.hs | 7 | ||||
| -rw-r--r-- | src/Propellor/Types.hs | 5 |
3 files changed, 9 insertions, 9 deletions
diff --git a/src/Propellor/PrivData.hs b/src/Propellor/PrivData.hs index 6f3d4771..bc61c538 100644 --- a/src/Propellor/PrivData.hs +++ b/src/Propellor/PrivData.hs @@ -81,7 +81,7 @@ withPrivData :: ( IsContext c , IsPrivDataSource s - , IncludesInfo metatypes ~ True + , IncludesInfo metatypes ~ 'True ) => s -> c @@ -94,7 +94,7 @@ withSomePrivData :: ( IsContext c , IsPrivDataSource s - , IncludesInfo metatypes ~ True + , IncludesInfo metatypes ~ 'True ) => [s] -> c @@ -106,7 +106,7 @@ withPrivData' :: ( IsContext c , IsPrivDataSource s - , IncludesInfo metatypes ~ True + , IncludesInfo metatypes ~ 'True ) => ((PrivDataField, PrivData) -> v) -> [s] diff --git a/src/Propellor/Property.hs b/src/Propellor/Property.hs index c665b6a0..582b7cfb 100644 --- a/src/Propellor/Property.hs +++ b/src/Propellor/Property.hs @@ -56,7 +56,6 @@ import Propellor.Types import Propellor.Types.ResultCheck import Propellor.Types.MetaTypes import Propellor.Info -import Propellor.Exception import Propellor.EnsureProperty import Utility.Exception import Utility.Monad @@ -256,13 +255,13 @@ isNewerThan x y = do tightenTargets :: -- Note that this uses PolyKinds - ( (Targets old `NotSuperset` Targets new) ~ CanCombineTargets - , (NonTargets new `NotSuperset` NonTargets old) ~ CanCombineTargets + ( (Targets old `NotSuperset` Targets new) ~ 'CanCombineTargets + , (NonTargets new `NotSuperset` NonTargets old) ~ 'CanCombineTargets , SingI new ) => Property (MetaTypes old) -> Property (MetaTypes new) -tightenTargets (Property old d a i c) = Property sing d a i c +tightenTargets (Property _old d a i c) = Property sing d a i c {- diff --git a/src/Propellor/Types.hs b/src/Propellor/Types.hs index f23a18dd..23716e58 100644 --- a/src/Propellor/Types.hs +++ b/src/Propellor/Types.hs @@ -28,6 +28,7 @@ module Propellor.Types , propertyDesc , propertyChildren , RevertableProperty(..) + , (<!>) , ChildProperty , IsProp(..) , Combines(..) @@ -153,7 +154,7 @@ addInfoProperty => Property metatypes -> Info -> Property (MetaTypes metatypes') -addInfoProperty (Property metatypes d a oldi c) newi = +addInfoProperty (Property _ d a oldi c) newi = Property sing d a (oldi <> newi) c {- @@ -269,7 +270,7 @@ class Combines x y where -> CombinedType x y instance (CannotCombineTargets x y (Combine x y) ~ 'CanCombineTargets, SingI (Combine x y)) => Combines (Property (MetaTypes x)) (Property (MetaTypes y)) where - combineWith f _ (Property t1 d1 a1 i1 c1) (Property _t2 d2 a2 i2 c2) = + combineWith f _ (Property _ d1 a1 i1 c1) (Property _ d2 a2 i2 c2) = Property sing d1 (f a1 a2) i1 (ChildProperty d2 a2 i2 c2 : c1) instance (CannotCombineTargets x y (Combine x y) ~ 'CanCombineTargets, CannotCombineTargets x' y' (Combine x' y') ~ 'CanCombineTargets, SingI (Combine x y), SingI (Combine x' y')) => Combines (RevertableProperty (MetaTypes x) (MetaTypes x')) (RevertableProperty (MetaTypes y) (MetaTypes y')) where combineWith sf tf (RevertableProperty s1 t1) (RevertableProperty s2 t2) = |