diff options
author | Paul Phillips <paulp@improving.org> | 2010-04-05 06:24:22 +0000 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2010-04-05 06:24:22 +0000 |
commit | e8a121e9e1ade3f283f42fceb3c18f30a8468f57 (patch) | |
tree | fc58111a69bb8940f7c5bd341fa3a8f097955403 /test/files/res | |
parent | 28ed5c6b216463a6e5bd8f06986c35a2036bda3f (diff) | |
download | scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.tar.gz scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.tar.bz2 scala-e8a121e9e1ade3f283f42fceb3c18f30a8468f57.zip |
If I work on this patch any longer without chec...
If I work on this patch any longer without checking in I will go
stark raving mad. It is broken up into a couple pieces. This one is
the changes to test/. It includes fixing a bunch of tests, removing
deprecated constructs, moving jars used by tests to the most specific
plausible location rather than having all jars on the classpath of all
tests, and some filesystem layout change (continuations get their whole
own srcpath.) This would be the world's most tedious review, so let's
say no review.
[Note: after this commit, I doubt things will build very smoothly until
the rest of the partest changes follow. Which should only be seconds,
but just in case.]
Diffstat (limited to 'test/files/res')
-rw-r--r-- | test/files/res/bug687.check | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/test/files/res/bug687.check b/test/files/res/bug687.check index ee9520d1ea..353101c38b 100644 --- a/test/files/res/bug687.check +++ b/test/files/res/bug687.check @@ -1,11 +1,10 @@ - nsc> -nsc> bug687/QueryB.scala:3: error: name clash between defined and inherited member: +nsc> +bug687/QueryB.scala:3: error: name clash between defined and inherited member: method equals:(o: java.lang.Object)Boolean and method equals:(x$1: Any)Boolean in class Any have same type after erasure: (o: java.lang.Object)Boolean override def equals(o : Object) = false; ^ - nsc> nsc> |