Skip to content

Commit

Permalink
SI-8126 Puts SI-6899 fix under a source level flag
Browse files Browse the repository at this point in the history
  • Loading branch information
huitseeker committed Jan 16, 2014
1 parent d43618a commit 6dd3653
Showing 1 changed file with 1 addition and 1 deletion.
2 changes: 1 addition & 1 deletion src/compiler/scala/tools/nsc/typechecker/Implicits.scala
Expand Up @@ -1365,7 +1365,7 @@ trait Implicits {
maybeInvalidConversionError("the result type of an implicit conversion must be more specific than AnyRef")
result = SearchFailure
}
else if (isInvalidConversionSource(pt)) {
else if (settings.isScala211 && isInvalidConversionSource(pt)) {
maybeInvalidConversionError("an expression of type Null is ineligible for implicit conversion")
result = SearchFailure
}
Expand Down

0 comments on commit 6dd3653

Please sign in to comment.