diff options
| author | Paul Phillips <paulp@improving.org> | 2011-01-07 06:18:26 +0000 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2011-01-07 06:18:26 +0000 |
| commit | 57ea3841d29a5c3d48eee68868780b19f1a49166 (patch) | |
| tree | 7108d28edcbe4bcd8263ddc403d66bb033d4f653 /test | |
| parent | 5d022058c4fb2f448eee35d6df7f508c24d2a0be (diff) | |
| download | scala-57ea3841d29a5c3d48eee68868780b19f1a49166.tar.gz scala-57ea3841d29a5c3d48eee68868780b19f1a49166.tar.bz2 scala-57ea3841d29a5c3d48eee68868780b19f1a49166.zip | |
Apparently my flailing attempts to make things ...
Apparently my flailing attempts to make things faster earned me the
pity of Tiark, who sent this monster patch which he probably dashed
off before the appetizers had been cleared away. All the steak is his
but I threw in a little sizzle so I could feel like a part of things.
It knocks about a bazillion miniseconds off the time spent in implicit
search.
This is the same patch martin already endorsed, give or take several
hundred lines of diff, so I will say no review, even though I know it
will be hard to look away. I trimmed most of the "speculative code"
(that is, the commented out bits) because it's getting awfully busy
along those sidelines. I will preserve the ideas in some more structured
form.
Diffstat (limited to 'test')
| -rw-r--r-- | test/files/buildmanager/t2556_3/t2556_3.check | 4 | ||||
| -rw-r--r-- | test/files/neg/bug900.check | 2 |
2 files changed, 3 insertions, 3 deletions
diff --git a/test/files/buildmanager/t2556_3/t2556_3.check b/test/files/buildmanager/t2556_3/t2556_3.check index af0c63eebc..01dfa79b12 100644 --- a/test/files/buildmanager/t2556_3/t2556_3.check +++ b/test/files/buildmanager/t2556_3/t2556_3.check @@ -11,8 +11,8 @@ B.scala:3: error: type mismatch; found : C required: ?{val x: ?} Note that implicit conversions are not applicable because they are ambiguous: - both method any2ArrowAssoc in object Predef of type [A](x: A)ArrowAssoc[A] - and method any2Ensuring in object Predef of type [A](x: A)Ensuring[A] + both method any2Ensuring in object Predef of type [A](x: A)Ensuring[A] + and method any2ArrowAssoc in object Predef of type [A](x: A)ArrowAssoc[A] are possible conversion functions from C to ?{val x: ?} println( (new C).x ) ^ diff --git a/test/files/neg/bug900.check b/test/files/neg/bug900.check index 6085ffea06..95f71557b8 100644 --- a/test/files/neg/bug900.check +++ b/test/files/neg/bug900.check @@ -2,7 +2,7 @@ bug900.scala:4: error: type mismatch; found : Foo.this.x.type (with underlying type Foo.this.bar) required: AnyRef Note that implicit conversions are not applicable because they are ambiguous: - both method any2stringadd in object Predef of type (x: Any)scala.runtime.StringAdd + both method any2Ensuring in object Predef of type [A](x: A)Ensuring[A] and method any2ArrowAssoc in object Predef of type [A](x: A)ArrowAssoc[A] are possible conversion functions from Foo.this.x.type to AnyRef def break(): x.type |