diff options
author | Paul Phillips <paulp@improving.org> | 2012-10-07 15:20:51 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2012-10-07 15:20:51 -0700 |
commit | a5a1f01b7d458b94e37407681abb3334a543fb03 (patch) | |
tree | 93ddf4e9ed05e4108f1b9d82a0960c516b1c3e77 /test/files/neg/t3692-old.check | |
parent | 7be1652cbf1300fe5fea44681a480c33467c2296 (diff) | |
parent | 65a321c63e5ddb77fa87de098c4f7d6f9ce8baa6 (diff) | |
download | scala-a5a1f01b7d458b94e37407681abb3334a543fb03.tar.gz scala-a5a1f01b7d458b94e37407681abb3334a543fb03.tar.bz2 scala-a5a1f01b7d458b94e37407681abb3334a543fb03.zip |
Merge remote-tracking branch 'origin/2.10.0-wip' into merge-2.10
* origin/2.10.0-wip:
MethodSymbol.params => MethodSymbol.paramss
SI-6471 Update jquery from 1.4.2 to 1.8.2
undeprecates manifests for 2.10.0
SI-6451: Rename classes in `unchecked-abstract.scala` test.
Put more implementation restrictions on value classes.
Fixed problem in SI-6408
Revised restrictions for value classes and unversal traits
SI-6436 Handle ambiguous string processors
fixes a bug in a weak cache in runtime reflection
Conflicts:
test/files/neg/classmanifests_new_deprecations.check
test/files/neg/unchecked-abstract.check
Diffstat (limited to 'test/files/neg/t3692-old.check')
-rw-r--r-- | test/files/neg/t3692-old.check | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/test/files/neg/t3692-old.check b/test/files/neg/t3692-old.check index 950f82951c..9f3ae516aa 100644 --- a/test/files/neg/t3692-old.check +++ b/test/files/neg/t3692-old.check @@ -7,14 +7,8 @@ t3692-old.scala:14: warning: non-variable type argument Int in type pattern Map[ t3692-old.scala:15: warning: non-variable type argument Int in type pattern Map[T,Int] is unchecked since it is eliminated by erasure case m2: Map[T, Int] => new java.util.HashMap[T, Integer] ^ -t3692-old.scala:11: warning: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - private final def toJavaMap[T, V](map: Map[T, V])(implicit m1: Manifest[T], m2: Manifest[V]): java.util.Map[_, _] = { - ^ -t3692-old.scala:11: warning: type Manifest in object Predef is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead - private final def toJavaMap[T, V](map: Map[T, V])(implicit m1: Manifest[T], m2: Manifest[V]): java.util.Map[_, _] = { - ^ t3692-old.scala:15: error: unreachable code case m2: Map[T, Int] => new java.util.HashMap[T, Integer] ^ -5 warnings found +three warnings found one error found |