Follow hlint suggestion: Use infix for set ops

- For union and intersect

Author: philderbeast

Cabal-syntax/src/Distribution/Types/VersionInterval/Legacy.hs

@@ -309,19 +309,19 @@ unionVersionIntervals
   -> VersionIntervals
   -> VersionIntervals
 unionVersionIntervals (VersionIntervals is0) (VersionIntervals is'0) =
-  checkInvariant (VersionIntervals (union is0 is'0))
+  checkInvariant (VersionIntervals (is0 `union` is'0))
   where
     union is [] = is
     union [] is' = is'
     union (i : is) (i' : is') = case unionInterval i i' of
       -- @i < i'@ and separated: keep @i@.
       Left Nothing -> i : union is (i' : is')
       -- @i'' = i ∪ i'@ and @i@ ends first: drop @i@, replace @i'@ by @i''@.
-      Left (Just i'') -> union is (i'' : is')
+      Left (Just i'') -> is `union` (i'' : is')
       -- @i' < i@ and separated: keep @i'@.
       Right Nothing -> i' : union (i : is) is'
       -- @i'' = i ∪ i'@ and @i'@ ends first: drop @i'@, replace @i@ by @i''@.
-      Right (Just i'') -> union (i'' : is) is'
+      Right (Just i'') -> (i'' : is) `union` is'
 
 -- | Given two version intervals @i1@ and @i2@, return one of the following:
 --
@@ -364,17 +364,17 @@ intersectVersionIntervals
   -> VersionIntervals
   -> VersionIntervals
 intersectVersionIntervals (VersionIntervals is0) (VersionIntervals is'0) =
-  checkInvariant (VersionIntervals (intersect is0 is'0))
+  checkInvariant (VersionIntervals (is0 `intersect` is'0))
   where
     intersect _ [] = []
     intersect [] _ = []
     intersect (i : is) (i' : is') = case intersectInterval i i' of
       -- @i < i'@: throw out @i@
-      Left Nothing -> intersect is (i' : is')
+      Left Nothing -> is `intersect` (i' : is')
       -- @i'' = i /\ i'@ and @i@ ends first: replace @i@ by @i''@.
       Left (Just i'') -> i'' : intersect is (i' : is')
       -- @i' < i@: throw out @i'@
-      Right Nothing -> intersect (i : is) is'
+      Right Nothing -> (i : is) `intersect` is'
       -- @i'' = i /\ i'@ and @i'@ ends first: replace @i'@ by @i''@.
       Right (Just i'') -> i'' : intersect (i : is) is'
 

Cabal-syntax/src/Distribution/Types/VersionRange.hs

@@ -96,12 +96,12 @@ foldVersionRange _any this later earlier union intersect = fold
 
     alg (ThisVersionF v) = this v
     alg (LaterVersionF v) = later v
-    alg (OrLaterVersionF v) = union (this v) (later v)
+    alg (OrLaterVersionF v) = this v `union` later v
     alg (EarlierVersionF v) = earlier v
-    alg (OrEarlierVersionF v) = union (this v) (earlier v)
+    alg (OrEarlierVersionF v) = this v `union` earlier v
     alg (MajorBoundVersionF v) = fold (majorBound v)
-    alg (UnionVersionRangesF v1 v2) = union v1 v2
-    alg (IntersectVersionRangesF v1 v2) = intersect v1 v2
+    alg (UnionVersionRangesF v1 v2) = v1 `union` v2
+    alg (IntersectVersionRangesF v1 v2) = v1 `intersect` v2
 
     majorBound v =
       intersectVersionRanges