Skip to content

Commit 93602dd

Browse files
authored
Merge pull request scala/scala#10593 from som-snytt/issue/9176-null-conversion
BigInt conversion checks for null
2 parents 66a7f4a + 6abe7f4 commit 93602dd

File tree

3 files changed

+3
-3
lines changed

3 files changed

+3
-3
lines changed

library/src/scala/collection/IterableOnce.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -254,7 +254,7 @@ final class IterableOnceExtensionMethods[A](private val it: IterableOnce[A]) ext
254254
}
255255

256256
object IterableOnce {
257-
@`inline` implicit def iterableOnceExtensionMethods[A](it: IterableOnce[A]): IterableOnceExtensionMethods[A] =
257+
@inline implicit def iterableOnceExtensionMethods[A](it: IterableOnce[A]): IterableOnceExtensionMethods[A] =
258258
new IterableOnceExtensionMethods[A](it)
259259

260260
/** Computes the number of elements to copy to an array from a source IterableOnce

library/src/scala/math/BigInt.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -123,7 +123,7 @@ object BigInt {
123123

124124
/** Implicit conversion from `java.math.BigInteger` to `scala.BigInt`.
125125
*/
126-
implicit def javaBigInteger2bigInt(x: BigInteger): BigInt = apply(x)
126+
implicit def javaBigInteger2bigInt(x: BigInteger): BigInt = if (x eq null) null else apply(x)
127127

128128
// this method is adapted from Google Guava's version at
129129
// https://github.com/google/guava/blob/master/guava/src/com/google/common/math/LongMath.java

library/src/scala/util/ChainingOps.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ package util
1616
import scala.language.implicitConversions
1717

1818
trait ChainingSyntax {
19-
@`inline` implicit final def scalaUtilChainingOps[A](a: A): ChainingOps[A] = new ChainingOps(a)
19+
@inline implicit final def scalaUtilChainingOps[A](a: A): ChainingOps[A] = new ChainingOps(a)
2020
}
2121

2222
/** Adds chaining methods `tap` and `pipe` to every type.

0 commit comments

Comments
 (0)