Merge pull request scala/scala#10139 from jxnu-liguobin/p12635-range-contains

SethTisue · web-flow · commit ead668495dc3 · 2022-09-23T11:13:55.000-07:00
diff --git a/library/src/scala/collection/immutable/Range.scala b/library/src/scala/collection/immutable/Range.scala
@@ -373,11 +373,11 @@ sealed abstract class Range(
     if (x == end && !isInclusive) false
     else if (step > 0) {
       if (x < start || x > end) false
-      else (step == 1) || (((x - start) % step) == 0)
+      else (step == 1) || (Integer.remainderUnsigned(x - start, step) == 0)
     }
     else {
       if (x < end || x > start) false
-      else (step == -1) || (((x - start) % step) == 0)
+      else (step == -1) || (Integer.remainderUnsigned(start - x, -step) == 0)
     }
   }
   /* Seq#contains has a type parameter so the optimised contains above doesn't override it */

Original file line number	Diff line number	Diff line change
`@@ -373,11 +373,11 @@ sealed abstract class Range(`
`373`	`373`	`if (x == end && !isInclusive) false`
`374`	`374`	`else if (step > 0) {`
`375`	`375`	`if (x < start \|\| x > end) false`
`376`		`- else (step == 1) \|\| (((x - start) % step) == 0)`
	`376`	`+ else (step == 1) \|\| (Integer.remainderUnsigned(x - start, step) == 0)`
`377`	`377`	`}`
`378`	`378`	`else {`
`379`	`379`	`if (x < end \|\| x > start) false`
`380`		`- else (step == -1) \|\| (((x - start) % step) == 0)`
	`380`	`+ else (step == -1) \|\| (Integer.remainderUnsigned(start - x, -step) == 0)`
`381`	`381`	`}`
`382`	`382`	`}`
`383`	`383`	`/* Seq#contains has a type parameter so the optimised contains above doesn't override it */`