diff options
Diffstat (limited to 'test/files/neg/t4158.check')
-rw-r--r-- | test/files/neg/t4158.check | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t4158.check b/test/files/neg/t4158.check index db61ff2ec4..3ee2627c5b 100644 --- a/test/files/neg/t4158.check +++ b/test/files/neg/t4158.check @@ -3,7 +3,7 @@ t4158.scala:3: error: type mismatch; required: Int Note that implicit conversions are not applicable because they are ambiguous: both method Integer2intNullConflict in class LowPriorityImplicits of type (x: Null)Int - and method Integer2int in object Predef of type (x: java.lang.Integer)Int + and method Integer2int in object Predef of type (x: Integer)Int are possible conversion functions from Null(null) to Int var y = null: Int ^ @@ -12,7 +12,7 @@ t4158.scala:2: error: type mismatch; required: Int Note that implicit conversions are not applicable because they are ambiguous: both method Integer2intNullConflict in class LowPriorityImplicits of type (x: Null)Int - and method Integer2int in object Predef of type (x: java.lang.Integer)Int + and method Integer2int in object Predef of type (x: Integer)Int are possible conversion functions from Null(null) to Int var x: Int = null ^ |