From 7943084a2d06e21f112b4efd0ab70ec6e38ce510 Mon Sep 17 00:00:00 2001
From: Simon Ochsenreither <simon@ochsenreither.de>
Date: Fri, 5 Jul 2013 14:37:48 +0200
Subject: SI-7624 Fix -feature warnings and build with -feature

I added a language.existential import to LazyCombiner.scala which
should not be necessary, but causes a spurious warning otherwise:

    scala/src/library/scala/collection/parallel/mutable/LazyCombiner.scala:33:
    warning: the existential type
        scala.collection.parallel.mutable.LazyCombiner[_$1,_$2,_$3] forSome {
          type _$1; type _$2; type _$3 <: scala.collection.generic.Growable[_$1] with scala.collection.generic.Sizing },
    which cannot be expressed by wildcards, should be enabled by making the implicit value scala.language.existentials visible.
    if (other.isInstanceOf[LazyCombiner[_, _, _]]) {
                       ^

I created ticket SI-7750 to track this issue.
---
 src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

(limited to 'src/scaladoc')

diff --git a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
index c4e3c115be..8f217e087c 100644
--- a/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
+++ b/src/scaladoc/scala/tools/nsc/doc/model/ModelFactory.scala
@@ -305,10 +305,9 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
       else None
     }
 
+    private def templateAndType(ancestor: Symbol): (TemplateImpl, TypeEntity) = (makeTemplate(ancestor), makeType(reprSymbol.info.baseType(ancestor), this))
     lazy val (linearizationTemplates, linearizationTypes) =
-      reprSymbol.ancestors map { ancestor =>
-        (makeTemplate(ancestor), makeType(reprSymbol.info.baseType(ancestor), this))
-      } unzip
+      (reprSymbol.ancestors map templateAndType).unzip
 
     /* Subclass cache */
     private lazy val subClassesCache = (
@@ -321,7 +320,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
     }
     def directSubClasses = if (subClassesCache == null) Nil else subClassesCache.toList
 
-    /* Implcitly convertible class cache */
+    /* Implicitly convertible class cache */
     private var implicitlyConvertibleClassesCache: mutable.ListBuffer[(DocTemplateImpl, ImplicitConversionImpl)] = null
     def registerImplicitlyConvertibleClass(dtpl: DocTemplateImpl, conv: ImplicitConversionImpl): Unit = {
       if (implicitlyConvertibleClassesCache == null)
@@ -841,7 +840,7 @@ class ModelFactory(val global: Global, val settings: doc.Settings) {
                 def value = tree
               }
             }
-          case None => 
+          case None =>
             argTrees map { tree =>
               new ValueArgument {
                 def parameter = None
-- 
cgit v1.2.3