summaryrefslogtreecommitdiff
path: root/test
diff options
context:
space:
mode:
authorMartin Odersky <odersky@gmail.com>2010-01-04 20:46:26 +0000
committerMartin Odersky <odersky@gmail.com>2010-01-04 20:46:26 +0000
commit6af8cbb3612071cdb04dcbb8d29a0c62b0690ca9 (patch)
tree32fd7d679e4f9e73f808709dd85f1fe7af31b27b /test
parente5d37b199df4d04eda46ddc0cf4b33f9503bfbc0 (diff)
downloadscala-6af8cbb3612071cdb04dcbb8d29a0c62b0690ca9.tar.gz
scala-6af8cbb3612071cdb04dcbb8d29a0c62b0690ca9.tar.bz2
scala-6af8cbb3612071cdb04dcbb8d29a0c62b0690ca9.zip
Added extensive statistics, reduced time of imp...
Added extensive statistics, reduced time of implicit resolution by 2/3rds, of whole typer by 1/4 to 1/3rd.
Diffstat (limited to 'test')
-rw-r--r--test/files/neg/t2641.check6
-rw-r--r--test/files/run/implicits.scala1
2 files changed, 2 insertions, 5 deletions
diff --git a/test/files/neg/t2641.check b/test/files/neg/t2641.check
index 9894f62db7..07900d0796 100644
--- a/test/files/neg/t2641.check
+++ b/test/files/neg/t2641.check
@@ -9,10 +9,6 @@ t2641.scala:18: error: illegal inheritance;
self-type ManagedSeq does not conform to scala.collection.TraversableView[A,ManagedSeqStrict[A]]'s selftype scala.collection.TraversableView[A,ManagedSeqStrict[A]]
with TraversableView[A, ManagedSeqStrict[A]]
^
-t2641.scala:19: error: illegal inheritance;
- self-type ManagedSeq does not conform to scala.collection.TraversableViewLike[A,ManagedSeqStrict[A],<error>]'s selftype scala.collection.TraversableViewLike[A,Coll,This]
- with TraversableViewLike[A, ManagedSeqStrict[A], ManagedSeq[A]]
- ^
t2641.scala:17: error: illegal inheritance;
self-type ManagedSeq does not conform to ScalaObject's selftype ScalaObject
extends ManagedSeqStrict[A]
@@ -36,4 +32,4 @@ t2641.scala:27: error: illegal inheritance; superclass Any
t2641.scala:28: error: value managedIterator is not a member of ManagedSeq
override def managedIterator = self.managedIterator slice (from, until)
^
-10 errors found
+9 errors found
diff --git a/test/files/run/implicits.scala b/test/files/run/implicits.scala
index e554575284..5fa841c258 100644
--- a/test/files/run/implicits.scala
+++ b/test/files/run/implicits.scala
@@ -19,6 +19,7 @@ object Test extends Application {
import A.B._
val c = new C("OK")
val i = new c.Inner
+ import c.Inner._
val s: String = i
Console.println(s)
Console.println(2: String)