summaryrefslogtreecommitdiff
path: root/test/files/neg/t3691.check
diff options
context:
space:
mode:
authorPaul Phillips <paulp@improving.org>2012-03-14 12:27:53 -0700
committerPaul Phillips <paulp@improving.org>2012-03-14 12:27:53 -0700
commita127aae2a5fbae146ea81e470541209436222970 (patch)
tree75b8a7d3362896fd6562eac321b239326296b48a /test/files/neg/t3691.check
parent0c9ffe55c774de261d32f36cc29b954638e86574 (diff)
parent5b562d4e7e451156236b48b3591db980a5691f8d (diff)
downloadscala-a127aae2a5fbae146ea81e470541209436222970.tar.gz
scala-a127aae2a5fbae146ea81e470541209436222970.tar.bz2
scala-a127aae2a5fbae146ea81e470541209436222970.zip
Merge branch 'merge-inline' of /scratch/trunk3 into develop
Diffstat (limited to 'test/files/neg/t3691.check')
-rw-r--r--test/files/neg/t3691.check4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/files/neg/t3691.check b/test/files/neg/t3691.check
index cd7b440dce..bdf6c268b2 100644
--- a/test/files/neg/t3691.check
+++ b/test/files/neg/t3691.check
@@ -1,10 +1,10 @@
t3691.scala:4: error: type mismatch;
- found : Object with Test.A[String]
+ found : Test.A[String]
required: AnyRef{type A[x]}
val b = (new A[String]{}): { type A[x] } // not ok
^
t3691.scala:5: error: type mismatch;
- found : Object with Test.A[String]
+ found : Test.A[String]
required: AnyRef{type A}
val c = (new A[String]{}): { type A } // not ok
^