summaryrefslogtreecommitdiff
path: root/src/library/scala/Predef.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-04-08 15:08:51 +0200
committerJason Zaugg <jzaugg@gmail.com>2013-04-08 22:53:21 +0200
commitb0fceebae53fa140619ccf2cfcb8e4cf7f20f88b (patch)
tree8bb5c2251f9e2d495adec766e437ccf8cb99beb6 /src/library/scala/Predef.scala
parentae69de4cb610c2b92fd51052cd32702dd3bd1e9f (diff)
downloadscala-b0fceebae53fa140619ccf2cfcb8e4cf7f20f88b.tar.gz
scala-b0fceebae53fa140619ccf2cfcb8e4cf7f20f88b.tar.bz2
scala-b0fceebae53fa140619ccf2cfcb8e4cf7f20f88b.zip
SI-7335 Sharpen up comment about implicit prioritization.
Diffstat (limited to 'src/library/scala/Predef.scala')
-rw-r--r--src/library/scala/Predef.scala3
1 files changed, 1 insertions, 2 deletions
diff --git a/src/library/scala/Predef.scala b/src/library/scala/Predef.scala
index 511e5b842a..569157de20 100644
--- a/src/library/scala/Predef.scala
+++ b/src/library/scala/Predef.scala
@@ -484,7 +484,7 @@ private[scala] abstract class LowPriorityImplicits {
// These eight implicits exist solely to exclude Null from the domain of
// the boxed types, so that e.g. "var x: Int = null" is a compile time
// error rather than a delayed null pointer exception by way of the
- // conversion from java.lang.Integer. If defined in the same file as
+ // conversion from java.lang.Integer. If defined in the same template as
// Integer2int, they would have higher priority because Null is a subtype
// of Integer. We balance that out and create conflict by moving the
// definition into the superclass.
@@ -531,4 +531,3 @@ private[scala] abstract class LowPriorityImplicits {
def apply() = immutable.IndexedSeq.newBuilder[T]
}
}
-