diff options
author | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-04-30 00:37:43 +0000 |
---|---|---|
committer | Antonio Cunei <antonio.cunei@epfl.ch> | 2010-04-30 00:37:43 +0000 |
commit | 660683929b6346d7a316273c145c677db7118e7d (patch) | |
tree | 5115150d7dbeadccd36c1fecc2468cf7f59763c9 /test/files | |
parent | 394ae087a71ff1e50827373dc73830c0fe799e3b (diff) | |
download | scala-660683929b6346d7a316273c145c677db7118e7d.tar.gz scala-660683929b6346d7a316273c145c677db7118e7d.tar.bz2 scala-660683929b6346d7a316273c145c677db7118e7d.zip |
Merged revisions 21747-21757 via svnmerge from
https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk
........
r21747 | odersky | 2010-04-29 15:12:20 +0200 (Thu, 29 Apr 2010) | 1 line
Tightened variances check. Review by prokopec.
........
r21748 | prokopec | 2010-04-29 15:21:42 +0200 (Thu, 29 Apr 2010) | 1 line
removed the dir info of the error messages. no review ........ r21749
| dragos | 2010-04-29 15:45:41 +0200 (Thu, 29 Apr 2010) | 1 line
Allow inlining for straight-line methods. Closes #3357, #3099. no
review. ........ r21750 | dragos | 2010-04-29 15:45:44 +0200 (Thu, 29
Apr 2010) | 2 lines
Fixed misaligning due to wide (double|long) parameters in the icode
reader. Improved constant folding through local variables. Closes #3191,
no review. ........ r21751 | dragos | 2010-04-29 15:45:47 +0200 (Thu, 29
Apr 2010) | 1 line
Reverted change that made partest fail with 'bin/javac: no such file'
when JAVA_HOME was not set (instead of using the javac on the PATH).
Reviewed by extempore, so no review. ........ r21752 | extempore |
2010-04-29 17:16:33 +0200 (Thu, 29 Apr 2010) | 2 lines
Removes pointless reference queue from the Symbol cache. Closes #3370,
no review. ........ r21753 | extempore | 2010-04-29 17:29:44 +0200 (Thu,
29 Apr 2010) | 3 lines
Took advantage of the sophisticated abstractions available in ant to
cut and paste the entirety of r21723 a little further down the build
file. No review. ........ r21754 | dragos | 2010-04-29 18:35:09 +0200
(Thu, 29 Apr 2010) | 3 lines
Regenerated FunctionN, AbstractFunctionN, etc. Changed
AbstractFunction to properly specialize on primitive types (scala.Int,
instead of scala.runtime.Int). Now closures should be indeed
specialized. No review. ........ r21755 | dubochet | 2010-04-29 19:01:22
+0200 (Thu, 29 Apr 2010) | 1 line
Closes #3310 (very large Scala class is compiled to invalid classfile
because Scala signature can't fit into constant pool). Review by dragos.
........ r21756 | dubochet | 2010-04-29 19:32:03 +0200 (Thu, 29 Apr
2010) | 1 line
[scaladoc] Closes #3302 (case class with private constructor). No
review. ........ r21757 | phaller | 2010-04-30 00:15:18 +0200 (Fri, 30
Apr 2010) | 1 line
Deprecated two members of RemoteActor which clearly should not be
in the public API. Removed unnecessary casts. Some more complete doc
comments. No review. ........
Diffstat (limited to 'test/files')
-rw-r--r-- | test/files/neg/variances.check | 5 | ||||
-rw-r--r-- | test/files/neg/variances.scala | 8 |
2 files changed, 12 insertions, 1 deletions
diff --git a/test/files/neg/variances.check b/test/files/neg/variances.check index e6abdcbb53..c5269190c2 100644 --- a/test/files/neg/variances.check +++ b/test/files/neg/variances.check @@ -10,4 +10,7 @@ variances.scala:16: error: covariant type A occurs in invariant position in supe variances.scala:63: error: covariant type A occurs in contravariant position in type => test.Covariant.T[A]{def m: (A) => A} of value x val x: T[A] { ^ -four errors found +variances.scala:79: error: covariant type T occurs in contravariant position in type => test.TestAlias.B[C.this.A] of method foo + def foo: B[A] + ^ +5 errors found diff --git a/test/files/neg/variances.scala b/test/files/neg/variances.scala index 67783bc4aa..181783f48a 100644 --- a/test/files/neg/variances.scala +++ b/test/files/neg/variances.scala @@ -71,3 +71,11 @@ object Covariant { val t: T[Any] = ST t.x.m(new Object) } + +object TestAlias { + class B[-T] + trait C[+T] { + type A = T + def foo: B[A] + } +} |