summaryrefslogtreecommitdiff
path: root/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
diff options
context:
space:
mode:
authorEugene Burmako <xeno.by@gmail.com>2012-06-06 10:37:31 +0200
committerEugene Burmako <xeno.by@gmail.com>2012-06-08 15:32:08 +0200
commit3896a416faffe337a96f873214b02f231f306174 (patch)
tree73280b539c520818adbd1a9e49d9d1344fbd5dc1 /src/compiler/scala/tools/nsc/typechecker/Implicits.scala
parent6355d1a0b825c99560d4ccec1a8769f7421b1a71 (diff)
downloadscala-3896a416faffe337a96f873214b02f231f306174.tar.gz
scala-3896a416faffe337a96f873214b02f231f306174.tar.bz2
scala-3896a416faffe337a96f873214b02f231f306174.zip
miscellaneous cleanup, mostly fighting with feature warnings
Diffstat (limited to 'src/compiler/scala/tools/nsc/typechecker/Implicits.scala')
-rw-r--r--src/compiler/scala/tools/nsc/typechecker/Implicits.scala3
1 files changed, 2 insertions, 1 deletions
diff --git a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
index 9855284348..1ec4a7dc44 100644
--- a/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
+++ b/src/compiler/scala/tools/nsc/typechecker/Implicits.scala
@@ -17,6 +17,7 @@ import mutable.{ LinkedHashMap, ListBuffer }
import scala.util.matching.Regex
import symtab.Flags._
import util.Statistics._
+import language.implicitConversions
/** This trait provides methods to find various kinds of implicits.
*
@@ -335,7 +336,7 @@ trait Implicits {
* The _complexity_ of a stripped core type corresponds roughly to the number of
* nodes in its ast, except that singleton types are widened before taking the complexity.
* Two types overlap if they have the same type symbol, or
- * if one or both are intersection types with a pair of overlapiing parent types.
+ * if one or both are intersection types with a pair of overlapping parent types.
*/
private def dominates(dtor: Type, dted: Type): Boolean = {
def core(tp: Type): Type = tp.normalize match {