6 files changed, 108 insertions, 6 deletions
diff --git a/test/files/neg/classmanifests_new_deprecations.check b/test/files/neg/classmanifests_new_deprecations.check
new file mode 100644
index 0000000000..841e893249
--- /dev/null
+++ b/test/files/neg/classmanifests_new_deprecations.check
@@ -0,0 +1,61 @@
+classmanifests_new_deprecations.scala:2: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead
+  def cm1[T: ClassManifest] = ???
+           ^
+classmanifests_new_deprecations.scala:3: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead
+  def cm2[T](implicit evidence$1: ClassManifest[T]) = ???
+                                  ^
+classmanifests_new_deprecations.scala:4: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead
+  val cm3: ClassManifest[Int] = null
+           ^
+classmanifests_new_deprecations.scala:4: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead
+  val cm3: ClassManifest[Int] = null
+      ^
+classmanifests_new_deprecations.scala:6: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead
+  def rcm1[T: scala.reflect.ClassManifest] = ???
+            ^
+classmanifests_new_deprecations.scala:7: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead
+  def rcm2[T](implicit evidence$1: scala.reflect.ClassManifest[T]) = ???
+                                                 ^
+classmanifests_new_deprecations.scala:8: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead
+  val rcm3: scala.reflect.ClassManifest[Int] = null
+                          ^
+classmanifests_new_deprecations.scala:8: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead
+  val rcm3: scala.reflect.ClassManifest[Int] = null
+      ^
+classmanifests_new_deprecations.scala:10: error: type ClassManifest in object Predef is deprecated: Use scala.reflect.ClassTag instead
+  type CM[T] = ClassManifest[T]
+               ^
+classmanifests_new_deprecations.scala:15: error: type ClassManifest in package reflect is deprecated: Use scala.reflect.ClassTag instead
+  type RCM[T] = scala.reflect.ClassManifest[T]
+                              ^
+classmanifests_new_deprecations.scala:20: error: 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
+  def m1[T: Manifest] = ???
+          ^
+classmanifests_new_deprecations.scala:21: error: 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
+  def m2[T](implicit evidence$1: Manifest[T]) = ???
+                                 ^
+classmanifests_new_deprecations.scala:22: error: 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
+  val m3: Manifest[Int] = null
+          ^
+classmanifests_new_deprecations.scala:22: error: 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
+  val m3: Manifest[Int] = null
+      ^
+classmanifests_new_deprecations.scala:24: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
+  def rm1[T: scala.reflect.Manifest] = ???
+           ^
+classmanifests_new_deprecations.scala:25: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
+  def rm2[T](implicit evidence$1: scala.reflect.Manifest[T]) = ???
+                                                ^
+classmanifests_new_deprecations.scala:26: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
+  val rm3: scala.reflect.Manifest[Int] = null
+                         ^
+classmanifests_new_deprecations.scala:26: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
+  val rm3: scala.reflect.Manifest[Int] = null
+      ^
+classmanifests_new_deprecations.scala:28: error: 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
+  type M[T] = Manifest[T]
+              ^
+classmanifests_new_deprecations.scala:33: error: trait Manifest in package reflect is deprecated: Use scala.reflect.ClassTag (to capture erasures) or scala.reflect.runtime.universe.TypeTag (to capture types) or both instead
+  type RM[T] = scala.reflect.Manifest[T]
+                             ^
+20 errors found
diff --git a/test/files/neg/classmanifests_new_deprecations.flags b/test/files/neg/classmanifests_new_deprecations.flags
new file mode 100644
index 0000000000..e8fb65d50c
--- /dev/null
+++ b/test/files/neg/classmanifests_new_deprecations.flags
@@ -0,0 +1 @@
+-Xfatal-warnings
+\ No newline at end of file
diff --git a/test/files/neg/classmanifests_new_deprecations.scala b/test/files/neg/classmanifests_new_deprecations.scala
new file mode 100644
index 0000000000..563a0bc197
--- /dev/null
+++ b/test/files/neg/classmanifests_new_deprecations.scala
@@ -0,0 +1,37 @@
+object Test extends App {
+  def cm1[T: ClassManifest] = ???
+  def cm2[T](implicit evidence$1: ClassManifest[T]) = ???
+  val cm3: ClassManifest[Int] = null
+
+  def rcm1[T: scala.reflect.ClassManifest] = ???
+  def rcm2[T](implicit evidence$1: scala.reflect.ClassManifest[T]) = ???
+  val rcm3: scala.reflect.ClassManifest[Int] = null
+
+  type CM[T] = ClassManifest[T]
+  def acm1[T: CM] = ???
+  def acm2[T](implicit evidence$1: CM[T]) = ???
+  val acm3: CM[Int] = null
+
+  type RCM[T] = scala.reflect.ClassManifest[T]
+  def arcm1[T: RCM] = ???
+  def arcm2[T](implicit evidence$1: RCM[T]) = ???
+  val arcm3: RCM[Int] = null
+
+  def m1[T: Manifest] = ???
+  def m2[T](implicit evidence$1: Manifest[T]) = ???
+  val m3: Manifest[Int] = null
+
+  def rm1[T: scala.reflect.Manifest] = ???
+  def rm2[T](implicit evidence$1: scala.reflect.Manifest[T]) = ???
+  val rm3: scala.reflect.Manifest[Int] = null
+
+  type M[T] = Manifest[T]
+  def am1[T: M] = ???
+  def am2[T](implicit evidence$1: M[T]) = ???
+  val am3: M[Int] = null
+
+  type RM[T] = scala.reflect.Manifest[T]
+  def arm1[T: RM] = ???
+  def arm2[T](implicit evidence$1: RM[T]) = ???
+  val arm3: RM[Int] = null
+}
+\ No newline at end of file
diff --git a/test/files/neg/interop_abstypetags_arenot_classmanifests.check b/test/files/neg/interop_abstypetags_arenot_classmanifests.check
index 3134aadb58..15bdcfc5b1 100644
--- a/test/files/neg/interop_abstypetags_arenot_classmanifests.check
+++ b/test/files/neg/interop_abstypetags_arenot_classmanifests.check
@@ -1,4 +1,4 @@
-interop_abstypetags_arenot_classmanifests.scala:5: error: could not find implicit value for parameter m: ClassManifest[T]
+interop_abstypetags_arenot_classmanifests.scala:5: error: No ClassManifest available for T.
     println(classManifest[T])
                          ^
 one error found
diff --git a/test/files/neg/interop_typetags_arenot_classmanifests.check b/test/files/neg/interop_typetags_arenot_classmanifests.check
index 403625b4da..b404f94d69 100644
--- a/test/files/neg/interop_typetags_arenot_classmanifests.check
+++ b/test/files/neg/interop_typetags_arenot_classmanifests.check
@@ -1,4 +1,4 @@
-interop_typetags_arenot_classmanifests.scala:5: error: could not find implicit value for parameter m: ClassManifest[T]
+interop_typetags_arenot_classmanifests.scala:5: error: No ClassManifest available for T.
     println(classManifest[T])
                          ^
 one error found
diff --git a/test/files/neg/t3692-old.check b/test/files/neg/t3692-old.check
index a97a7d31ec..92d71f7e4e 100644
--- a/test/files/neg/t3692-old.check
+++ b/test/files/neg/t3692-old.check
@@ -1,8 +1,11 @@
-t3692-old.scala:6: warning: object Manifest in package reflect is deprecated: Use TypeTag instead
-    new ManifestTester().toJavaMap(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: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]
                               ^
-one warning found
+two warnings found
 one error found