Skip to content

Commit b5f7f6a

Browse files
committed
wip
1 parent ffeec01 commit b5f7f6a

File tree

1 file changed

+2
-11
lines changed

1 file changed

+2
-11
lines changed

or.go

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -194,10 +194,6 @@ func maxFloorlessCeiling(cs ...CeilingFloorConstrainter) (Endless, bool) {
194194
}
195195

196196
func matchAll(e, f Endless) bool {
197-
if e.wildcard() || f.wildcard() {
198-
return true
199-
}
200-
201197
if e.op.ceilingBounded() && f.op.ceilingBounded() {
202198
return false
203199
}
@@ -216,16 +212,11 @@ func matchAll(e, f Endless) bool {
216212
e, f = f, e
217213
}
218214

219-
vCmp := e.version.Compare(*f.version)
220-
if vCmp == 0 {
215+
if e.versionCompare(f.version) == 0 {
221216
return e.inclusive() || f.inclusive()
222217
}
223218

224-
if e.op.ceilingBounded() || f.op.floorBounded() {
225-
return false
226-
}
227-
228-
return true
219+
return !e.op.ceilingBounded() && !f.op.floorBounded()
229220
}
230221

231222
func compare(a, b CeilingFloorConstrainter) int {

0 commit comments

Comments
 (0)