Merged revisions 20307,20309-20312,20329,20341,...

Merged revisions
20307,20309-20312,20329,20341,20344,20349-20351,20357-20359,20363-20366,
20376-20377,20385-20388,20390,20398-20399,20401,20404-20406 via svnmerge
from https://lampsvn.epfl.ch/svn-repos/scala/scala/trunk

........
  r20307 | milessabin | 2009-12-23 12:55:30 +0100 (Wed, 23 Dec 2009) | 1 line

  In resident mode the reporter should be reset after each compiler Run.
review by odersky. ........ r20309 | odersky | 2009-12-23 16:02:17 +0100
(Wed, 23 Dec 2009) | 1 line

  Weeds out stale symbols in typer. review by milessabin. ........
r20310 | odersky | 2009-12-23 16:02:38 +0100 (Wed, 23 Dec 2009) | 1 line

  new testcase no review necessary.
........
  r20311 | extempore | 2009-12-23 18:57:36 +0100 (Wed, 23 Dec 2009) | 9 lines

  Created team of private[collection] abstract classes and traits in
  scala.collection.views. Factored boilerplate and base Transformed
  traits out of *ViewLike classes. Executive summary and motivation:

    4812029 Dec 23 09:47 scala-library.jar // before 604150 Dec 23 09:24
    4scala-library.jar // after

  Direct size savings of 4.5%.  Review by odersky.
........
  r20312 | odersky | 2009-12-23 21:09:54 +0100 (Wed, 23 Dec 2009) | 2 lines

  a more thorough treatment of the stale symbol problem. review by
milessabin. ........ r20329 | extempore | 2009-12-31 22:37:32 +0100
(Thu, 31 Dec 2009) | 1 line

  Added an XML.load overload which takes an URL.
........
  r20341 | phaller | 2010-01-04 13:06:07 +0100 (Mon, 04 Jan 2010) | 1 line

  Fixed #2852 and #2854.
........
  r20344 | rytz | 2010-01-04 15:08:25 +0100 (Mon, 04 Jan 2010) | 1 line

  fix parsing of .net types with inner classes
........
  r20349 | odersky | 2010-01-04 21:46:26 +0100 (Mon, 04 Jan 2010) | 2 lines

  Added extensive statistics, reduced time of implicit resolution by
2/3rds, of whole typer by 1/4 to 1/3rd. ........ r20350 | odersky |
2010-01-04 23:33:01 +0100 (Mon, 04 Jan 2010) | 3 lines

  refined changes to implicits to allow again implicits in non-static
companion objects. ........ r20351 | odersky | 2010-01-05 00:55:51 +0100
(Tue, 05 Jan 2010) | 2 lines

  polished statistics generation. no review necessary. ........ r20357 |
phaller | 2010-01-05 10:33:22 +0100 (Tue, 05 Jan 2010) | 1 line

  Adjusted timeout in test. No review.
........
  r20358 | phaller | 2010-01-05 12:39:12 +0100 (Tue, 05 Jan 2010) | 1 line

  Also run neg tests in directories in ant task. No review. ........
r20359 | rytz | 2010-01-05 15:02:13 +0100 (Tue, 05 Jan 2010) | 1 line

  rebuilt plugin test jars. no review
........
  r20363 | odersky | 2010-01-05 17:42:11 +0100 (Tue, 05 Jan 2010) | 1 line

  further optimizations to implicits. Added general purpose counters and
timers to statistics. no review. ........ r20364 | odersky | 2010-01-05
17:43:41 +0100 (Tue, 05 Jan 2010) | 1 line

  Closes #2853. No review necessary.
........
  r20365 | odersky | 2010-01-05 17:44:32 +0100 (Tue, 05 Jan 2010) | 1 line

  Closes #2848. No review.
........
  r20366 | phaller | 2010-01-05 17:57:30 +0100 (Tue, 05 Jan 2010) | 1 line

  Moved plugin neg tests to pending. No review.
........
  r20376 | plocinic | 2010-01-06 12:12:10 +0100 (Wed, 06 Jan 2010) | 1 line

  Closes #2793, #2651, #2650, #2653. Review by dragos. ........ r20377 |
plocinic | 2010-01-06 13:33:28 +0100 (Wed, 06 Jan 2010) | 1 line

  Fixes #2857. No review.
........
  r20385 | plocinic | 2010-01-06 16:26:36 +0100 (Wed, 06 Jan 2010) | 1 line

  Closes #2657, #2789. Review by dragos.
........
  r20386 | moors | 2010-01-06 17:23:42 +0100 (Wed, 06 Jan 2010) | 2 lines

  reinstated accidentally deleted comment
  no review
........
  r20387 | odersky | 2010-01-06 17:44:32 +0100 (Wed, 06 Jan 2010) | 1 line

  Fixed issue with operator symbols. '* is now a symbol. review by
community. ........ r20388 | odersky | 2010-01-06 17:46:48 +0100 (Wed,
06 Jan 2010) | 1 line

  further speed improvements by eliminating most uses of paramTypes.
Knocks off about 3% of typer time. Not overwhelming but still worth
doing. Review by rytz. ........ r20390 | milessabin | 2010-01-06
19:48:13 +0100 (Wed, 06 Jan 2010) | 1 line

  scalac portion of fix for #2689. For the isStale test to work as
intended the source file path has to be inferred from the orphaned
classfile. Review by Odersky. ........ r20398 | dragos | 2010-01-07
12:00:20 +0100 (Thu, 07 Jan 2010) | 2 lines

  Fixed #2850 -- while inside finally causes VerifyError, review by rytz
........
  r20399 | phaller | 2010-01-07 12:35:41 +0100 (Thu, 07 Jan 2010) | 1 line

  Fixed issue in Reactor/Actor that could lead to premature termination
of actors. Added test that could reproduce it (occurred more often on
larger inputs, but test should not take too much time). The issue also
caused the reactor-exceptionOnSend test to timeout sometimes. Review by
plocinic. ........ r20401 | odersky | 2010-01-07 13:03:44 +0100 (Thu, 07
Jan 2010) | 1 line

  Fixed #2844 with dpp's patch. review by xmlteam.
........
  r20404 | plocinic | 2010-01-07 17:41:18 +0100 (Thu, 07 Jan 2010) | 1 line

  Improvements in checking for references during dependency analysis.
For example more carefully analysis of abstract type members, typerefs
etc. References #2793. review by dragos. ........ r20405 | dragos |
2010-01-07 18:01:01 +0100 (Thu, 07 Jan 2010) | 2 lines

  Added warning for failed inlining when the target is @inline
annotated. No review necessary. ........ r20406 | dragos | 2010-01-07
18:24:21 +0100 (Thu, 07 Jan 2010) | 2 lines

  Added final modifiers to several classes used by Predef implicits.
Review by community. ........

43 files changed, 2 insertions, 374 deletions

diff --git a/test/files/neg/plugin-after-terminal.check b/test/files/neg/plugin-after-terminal.check
deleted file mode 100644
index 096efe09cd..0000000000
--- a/test/files/neg/plugin-after-terminal.check
+++ /dev/null
@@ -1,2 +0,0 @@
-error: [phase assembly, after dependency on terminal phase not allowed: afterterminal => terminal]
-one error found
diff --git a/test/files/neg/plugin-after-terminal.flags b/test/files/neg/plugin-after-terminal.flags
deleted file mode 100644
index 6a44376213..0000000000
--- a/test/files/neg/plugin-after-terminal.flags
+++ /dev/null
@@ -1,2 +0,0 @@
--Xplugin:files/neg/plugin-after-terminal/lib/plugins.jar
-
diff --git a/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1
deleted file mode 100644
index 23c54fb2de..0000000000
--- a/test/files/neg/plugin-after-terminal/lib/plugins.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-cf80703ed94f5176dc099c60b32d0483322de9eb ?plugins.jar
diff --git a/test/files/neg/plugin-after-terminal/misc/build.sh b/test/files/neg/plugin-after-terminal/misc/build.sh
deleted file mode 100755
index 8899009d7f..0000000000
--- a/test/files/neg/plugin-after-terminal/misc/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/"
-
-BASE=`pwd`
-
-if [[ -d "${BASE}/src" ]] ; then
-
-    mkdir -p build
-    ${SCALAC} -d build src/*.scala
-    jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build .
-    rm -rf build
-fi
-
diff --git a/test/files/neg/plugin-after-terminal/misc/scalac-plugin.xml b/test/files/neg/plugin-after-terminal/misc/scalac-plugin.xml
deleted file mode 100644
index 90ff27dc2a..0000000000
--- a/test/files/neg/plugin-after-terminal/misc/scalac-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-  <name>beforeparser</name>
-  <classname>scala.test.plugins.ThePlugin</classname>
-</plugin>
-
diff --git a/test/files/neg/plugin-after-terminal/src/ThePlugin.scala b/test/files/neg/plugin-after-terminal/src/ThePlugin.scala
deleted file mode 100644
index f3c913086e..0000000000
--- a/test/files/neg/plugin-after-terminal/src/ThePlugin.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package scala.test.plugins
-
-import scala.tools.nsc
-import nsc.Global
-import nsc.Phase
-import nsc.plugins.Plugin
-import nsc.plugins.PluginComponent
-
-class ThePlugin(val global: Global) extends Plugin {
-  import global._
-
-  val name = "afterterminal"
-  val description = "Declares one plugin that wants to be after the terminal phase"
-  val components = List[PluginComponent](thePhase)
-
-  private object thePhase extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]("terminal")
-
-    val phaseName = ThePlugin.this.name
-
-    def newPhase(prev: Phase) = new ThePhase(prev)
-  }
-
-  private class ThePhase(prev: Phase) extends Phase(prev) {
-    def name = ThePlugin.this.name
-    def run {}
-  }
-}
-
diff --git a/test/files/neg/plugin-after-terminal/testsource.scala b/test/files/neg/plugin-after-terminal/testsource.scala
deleted file mode 100644
index 519d162fdf..0000000000
--- a/test/files/neg/plugin-after-terminal/testsource.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test extends Application {
-  println("afterterminal")
-}
-
diff --git a/test/files/neg/plugin-before-parser.check b/test/files/neg/plugin-before-parser.check
deleted file mode 100644
index 9a407923b1..0000000000
--- a/test/files/neg/plugin-before-parser.check
+++ /dev/null
@@ -1,2 +0,0 @@
-error: [phase assembly, before dependency on parser phase not allowed: parser => beforeparser]
-one error found
diff --git a/test/files/neg/plugin-before-parser.flags b/test/files/neg/plugin-before-parser.flags
deleted file mode 100644
index 632530922c..0000000000
--- a/test/files/neg/plugin-before-parser.flags
+++ /dev/null
@@ -1,2 +0,0 @@
--Xplugin:files/neg/plugin-before-parser/lib/plugins.jar
-
diff --git a/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1
deleted file mode 100644
index 27c022e853..0000000000
--- a/test/files/neg/plugin-before-parser/lib/plugins.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2e05e73ed90aaf286fa6555d992c1da18de3ceca ?plugins.jar
diff --git a/test/files/neg/plugin-before-parser/misc/build.sh b/test/files/neg/plugin-before-parser/misc/build.sh
deleted file mode 100755
index 8899009d7f..0000000000
--- a/test/files/neg/plugin-before-parser/misc/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/"
-
-BASE=`pwd`
-
-if [[ -d "${BASE}/src" ]] ; then
-
-    mkdir -p build
-    ${SCALAC} -d build src/*.scala
-    jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build .
-    rm -rf build
-fi
-
diff --git a/test/files/neg/plugin-before-parser/misc/scalac-plugin.xml b/test/files/neg/plugin-before-parser/misc/scalac-plugin.xml
deleted file mode 100644
index 90ff27dc2a..0000000000
--- a/test/files/neg/plugin-before-parser/misc/scalac-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-  <name>beforeparser</name>
-  <classname>scala.test.plugins.ThePlugin</classname>
-</plugin>
-
diff --git a/test/files/neg/plugin-before-parser/src/ThePlugin.scala b/test/files/neg/plugin-before-parser/src/ThePlugin.scala
deleted file mode 100644
index 8714a55dc4..0000000000
--- a/test/files/neg/plugin-before-parser/src/ThePlugin.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package scala.test.plugins
-
-import scala.tools.nsc
-import nsc.Global
-import nsc.Phase
-import nsc.plugins.Plugin
-import nsc.plugins.PluginComponent
-
-class ThePlugin(val global: Global) extends Plugin {
-  import global._
-
-  val name = "beforeparser"
-  val description = "Declares one plugin that wants to be before the parser phase"
-  val components = List[PluginComponent](thePhase)
-
-  private object thePhase extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]()
-    override val runsBefore = List[String]("parser")
-
-    val phaseName = ThePlugin.this.name
-
-    def newPhase(prev: Phase) = new ThePhase(prev)
-  }
-
-  private class ThePhase(prev: Phase) extends Phase(prev) {
-    def name = ThePlugin.this.name
-    def run {}
-  }
-}
-
diff --git a/test/files/neg/plugin-before-parser/testsource.scala b/test/files/neg/plugin-before-parser/testsource.scala
deleted file mode 100644
index 9928aaa83c..0000000000
--- a/test/files/neg/plugin-before-parser/testsource.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test extends Application {
-  println("beforeparser")
-}
-
diff --git a/test/files/neg/plugin-cyclic-dependency.check b/test/files/neg/plugin-cyclic-dependency.check
deleted file mode 100644
index a29bc3f5be..0000000000
--- a/test/files/neg/plugin-cyclic-dependency.check
+++ /dev/null
@@ -1,2 +0,0 @@
-error: fatal error: Cycle in compiler phase dependencies detected, phase cyclicdependency1 reacted twice!
-one error found
diff --git a/test/files/neg/plugin-cyclic-dependency.flags b/test/files/neg/plugin-cyclic-dependency.flags
deleted file mode 100644
index 8716aaa65f..0000000000
--- a/test/files/neg/plugin-cyclic-dependency.flags
+++ /dev/null
@@ -1,2 +0,0 @@
--Xplugin:files/neg/plugin-cyclic-dependency/lib/plugins.jar
-
diff --git a/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1
deleted file mode 100644
index f1fb45387c..0000000000
--- a/test/files/neg/plugin-cyclic-dependency/lib/plugins.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-d96a5f1b3885225a5e203ae59ae2f2f3e3c65c9b ?plugins.jar
diff --git a/test/files/neg/plugin-cyclic-dependency/misc/build.sh b/test/files/neg/plugin-cyclic-dependency/misc/build.sh
deleted file mode 100755
index 8899009d7f..0000000000
--- a/test/files/neg/plugin-cyclic-dependency/misc/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/"
-
-BASE=`pwd`
-
-if [[ -d "${BASE}/src" ]] ; then
-
-    mkdir -p build
-    ${SCALAC} -d build src/*.scala
-    jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build .
-    rm -rf build
-fi
-
diff --git a/test/files/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml b/test/files/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml
deleted file mode 100644
index 90ff27dc2a..0000000000
--- a/test/files/neg/plugin-cyclic-dependency/misc/scalac-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-  <name>beforeparser</name>
-  <classname>scala.test.plugins.ThePlugin</classname>
-</plugin>
-
diff --git a/test/files/neg/plugin-cyclic-dependency/src/ThePlugin.scala b/test/files/neg/plugin-cyclic-dependency/src/ThePlugin.scala
deleted file mode 100644
index 1dfc15cb28..0000000000
--- a/test/files/neg/plugin-cyclic-dependency/src/ThePlugin.scala
+++ /dev/null
@@ -1,41 +0,0 @@
-package scala.test.plugins
-
-import scala.tools.nsc
-import nsc.Global
-import nsc.Phase
-import nsc.plugins.Plugin
-import nsc.plugins.PluginComponent
-
-class ThePlugin(val global: Global) extends Plugin {
-  import global._
-
-  val name = "cyclicdependency"
-  val description = "Declares two phases that have a cyclic dependency"
-  val components = List[PluginComponent](thePhase1,thePhase2)
-
-  private object thePhase1 extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]("tailcalls","cyclicdependency2")
-
-    val phaseName = ThePlugin.this.name + "1"
-
-    def newPhase(prev: Phase) = new ThePhase(prev)
-  }
-
-  private object thePhase2 extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]("dce","cyclicdependency1")
-
-    val phaseName = ThePlugin.this.name + "2"
-
-    def newPhase(prev: Phase) = new ThePhase(prev)
-  }
-
-  private class ThePhase(prev: Phase) extends Phase(prev) {
-    def name = ThePlugin.this.name
-    def run {}
-  }
-}
-
diff --git a/test/files/neg/plugin-cyclic-dependency/testsource.scala b/test/files/neg/plugin-cyclic-dependency/testsource.scala
deleted file mode 100644
index f1513ec9a0..0000000000
--- a/test/files/neg/plugin-cyclic-dependency/testsource.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test extends Application {
-  println("cyclicdependency")
-}
-
diff --git a/test/files/neg/plugin-multiple-rafter.check b/test/files/neg/plugin-multiple-rafter.check
deleted file mode 100644
index c54f884feb..0000000000
--- a/test/files/neg/plugin-multiple-rafter.check
+++ /dev/null
@@ -1,4 +0,0 @@
-error: fatal error: Multiple phases want to run right after the phase explicitouter
-Phases: erasure, multi-rafter, 
-Re-run with -Xgenerate-phase-graph <filename> to better see the problem.
-one error found
diff --git a/test/files/neg/plugin-multiple-rafter.flags b/test/files/neg/plugin-multiple-rafter.flags
deleted file mode 100644
index dcae7f2f96..0000000000
--- a/test/files/neg/plugin-multiple-rafter.flags
+++ /dev/null
@@ -1,2 +0,0 @@
--Xplugin:files/neg/plugin-multiple-rafter/lib/plugins.jar
-
diff --git a/test/files/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1
deleted file mode 100644
index f4905fcbd4..0000000000
--- a/test/files/neg/plugin-multiple-rafter/lib/plugins.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-2bda582b574287429ad5ee2e1d9a3effc88b0a5f ?plugins.jar
diff --git a/test/files/neg/plugin-multiple-rafter/misc/build.sh b/test/files/neg/plugin-multiple-rafter/misc/build.sh
deleted file mode 100755
index 8899009d7f..0000000000
--- a/test/files/neg/plugin-multiple-rafter/misc/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/"
-
-BASE=`pwd`
-
-if [[ -d "${BASE}/src" ]] ; then
-
-    mkdir -p build
-    ${SCALAC} -d build src/*.scala
-    jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build .
-    rm -rf build
-fi
-
diff --git a/test/files/neg/plugin-multiple-rafter/misc/scalac-plugin.xml b/test/files/neg/plugin-multiple-rafter/misc/scalac-plugin.xml
deleted file mode 100644
index 90ff27dc2a..0000000000
--- a/test/files/neg/plugin-multiple-rafter/misc/scalac-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-  <name>beforeparser</name>
-  <classname>scala.test.plugins.ThePlugin</classname>
-</plugin>
-
diff --git a/test/files/neg/plugin-multiple-rafter/src/ThePlugin.scala b/test/files/neg/plugin-multiple-rafter/src/ThePlugin.scala
deleted file mode 100644
index 4c761517c1..0000000000
--- a/test/files/neg/plugin-multiple-rafter/src/ThePlugin.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package scala.test.plugins
-
-import scala.tools.nsc
-import nsc.Global
-import nsc.Phase
-import nsc.plugins.Plugin
-import nsc.plugins.PluginComponent
-
-class ThePlugin(val global: Global) extends Plugin {
-  import global._
-
-  val name = "multi-rafter"
-  val description = ""
-  val components = List[PluginComponent](thePhase)
-
-  private object thePhase extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]()
-    override val runsRightAfter = Some("explicitouter")
-    val phaseName = ThePlugin.this.name
-
-    def newPhase(prev: Phase) = new ThePhase(prev)
-  }
-
-  private class ThePhase(prev: Phase) extends Phase(prev) {
-    def name = ThePlugin.this.name
-    def run {}
-  }
-}
-
diff --git a/test/files/neg/plugin-multiple-rafter/testsource.scala b/test/files/neg/plugin-multiple-rafter/testsource.scala
deleted file mode 100644
index f73db1eb60..0000000000
--- a/test/files/neg/plugin-multiple-rafter/testsource.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test extends Application {
-  println("multi-rafter")
-}
-
diff --git a/test/files/neg/plugin-rafter-before-1.check b/test/files/neg/plugin-rafter-before-1.check
deleted file mode 100644
index 19ed4d2fba..0000000000
--- a/test/files/neg/plugin-rafter-before-1.check
+++ /dev/null
@@ -1,2 +0,0 @@
-error: fatal error: phase erasure want to run right after explicitouter, but some phase has declared to run before erasure. Re-run with -Xgenerate-phase-graph <filename> to better see the problem.
-one error found
diff --git a/test/files/neg/plugin-rafter-before-1.flags b/test/files/neg/plugin-rafter-before-1.flags
deleted file mode 100644
index 8bf03145b9..0000000000
--- a/test/files/neg/plugin-rafter-before-1.flags
+++ /dev/null
@@ -1,2 +0,0 @@
--Xplugin:files/neg/plugin-rafter-before-1/lib/plugins.jar
-
diff --git a/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1
deleted file mode 100644
index b07cece8b9..0000000000
--- a/test/files/neg/plugin-rafter-before-1/lib/plugins.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-398fa866d1d5c6608c9607dd1079afc12182119f ?plugins.jar
diff --git a/test/files/neg/plugin-rafter-before-1/misc/build.sh b/test/files/neg/plugin-rafter-before-1/misc/build.sh
deleted file mode 100755
index 8899009d7f..0000000000
--- a/test/files/neg/plugin-rafter-before-1/misc/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/"
-
-BASE=`pwd`
-
-if [[ -d "${BASE}/src" ]] ; then
-
-    mkdir -p build
-    ${SCALAC} -d build src/*.scala
-    jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build .
-    rm -rf build
-fi
-
diff --git a/test/files/neg/plugin-rafter-before-1/misc/scalac-plugin.xml b/test/files/neg/plugin-rafter-before-1/misc/scalac-plugin.xml
deleted file mode 100644
index 90ff27dc2a..0000000000
--- a/test/files/neg/plugin-rafter-before-1/misc/scalac-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-  <name>beforeparser</name>
-  <classname>scala.test.plugins.ThePlugin</classname>
-</plugin>
-
diff --git a/test/files/neg/plugin-rafter-before-1/src/ThePlugin.scala b/test/files/neg/plugin-rafter-before-1/src/ThePlugin.scala
deleted file mode 100644
index c42a914066..0000000000
--- a/test/files/neg/plugin-rafter-before-1/src/ThePlugin.scala
+++ /dev/null
@@ -1,31 +0,0 @@
-package scala.test.plugins
-
-import scala.tools.nsc
-import nsc.Global
-import nsc.Phase
-import nsc.plugins.Plugin
-import nsc.plugins.PluginComponent
-
-class ThePlugin(val global: Global) extends Plugin {
-  import global._
-
-  val name = "rafter-before-1"
-  val description = ""
-  val components = List[PluginComponent](thePhase1)
-
-  private object thePhase1 extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]("refchecks")
-    override val runsBefore = List[String]("erasure")
-    val phaseName = ThePlugin.this.name
-
-    def newPhase(prev: Phase) = new ThePhase(prev)
-  }
-
-  private class ThePhase(prev: Phase) extends Phase(prev) {
-    def name = ThePlugin.this.name
-    def run {}
-  }
-}
-
diff --git a/test/files/neg/plugin-rafter-before-1/testsource.scala b/test/files/neg/plugin-rafter-before-1/testsource.scala
deleted file mode 100644
index 836459db22..0000000000
--- a/test/files/neg/plugin-rafter-before-1/testsource.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test extends Application {
-  println("rafter-before-1")
-}
-
diff --git a/test/files/neg/plugin-rightafter-terminal.check b/test/files/neg/plugin-rightafter-terminal.check
deleted file mode 100644
index 6fe4f63c82..0000000000
--- a/test/files/neg/plugin-rightafter-terminal.check
+++ /dev/null
@@ -1,2 +0,0 @@
-error: [phase assembly, right after dependency on terminal phase not allowed: rightafterterminal => terminal]
-one error found
diff --git a/test/files/neg/plugin-rightafter-terminal.flags b/test/files/neg/plugin-rightafter-terminal.flags
deleted file mode 100644
index 948a318668..0000000000
--- a/test/files/neg/plugin-rightafter-terminal.flags
+++ /dev/null
@@ -1,2 +0,0 @@
--Xplugin:files/neg/plugin-rightafter-terminal/lib/plugins.jar
-
diff --git a/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1 b/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1
deleted file mode 100644
index 78a4fc0c98..0000000000
--- a/test/files/neg/plugin-rightafter-terminal/lib/plugins.jar.desired.sha1
+++ /dev/null
@@ -1 +0,0 @@
-b2166b6bc2a55264d959e613fa52695295db2281 ?plugins.jar
diff --git a/test/files/neg/plugin-rightafter-terminal/misc/build.sh b/test/files/neg/plugin-rightafter-terminal/misc/build.sh
deleted file mode 100755
index 8899009d7f..0000000000
--- a/test/files/neg/plugin-rightafter-terminal/misc/build.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/bash
-
-SCALAC="../../../../build/pack/bin/scalac -deprecation -cp ../../../../build/quick/classes/compiler/"
-
-BASE=`pwd`
-
-if [[ -d "${BASE}/src" ]] ; then
-
-    mkdir -p build
-    ${SCALAC} -d build src/*.scala
-    jar cf lib/plugins.jar -C misc/ scalac-plugin.xml -C build .
-    rm -rf build
-fi
-
diff --git a/test/files/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml b/test/files/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml
deleted file mode 100644
index 90ff27dc2a..0000000000
--- a/test/files/neg/plugin-rightafter-terminal/misc/scalac-plugin.xml
+++ /dev/null
@@ -1,5 +0,0 @@
-<plugin>
-  <name>beforeparser</name>
-  <classname>scala.test.plugins.ThePlugin</classname>
-</plugin>
-
diff --git a/test/files/neg/plugin-rightafter-terminal/src/ThePlugin.scala b/test/files/neg/plugin-rightafter-terminal/src/ThePlugin.scala
deleted file mode 100644
index 47dd06ec8a..0000000000
--- a/test/files/neg/plugin-rightafter-terminal/src/ThePlugin.scala
+++ /dev/null
@@ -1,32 +0,0 @@
-package scala.test.plugins
-
-import scala.tools.nsc
-import nsc.Global
-import nsc.Phase
-import nsc.plugins.Plugin
-import nsc.plugins.PluginComponent
-
-class ThePlugin(val global: Global) extends Plugin {
-  import global._
-
-  val name = "rightafterterminal"
-  val description = "Declares one plugin that wants to be right after the terminal phase"
-  val components = List[PluginComponent](thePhase)
-
-  private object thePhase extends PluginComponent {
-    val global = ThePlugin.this.global
-
-    val runsAfter = List[String]()
-    override val runsRightAfter = Some("terminal")
-
-    val phaseName = ThePlugin.this.name
-
-    def newPhase(prev: Phase) = new ThePhase(prev)
-  }
-
-  private class ThePhase(prev: Phase) extends Phase(prev) {
-    def name = ThePlugin.this.name
-    def run {}
-  }
-}
-
diff --git a/test/files/neg/plugin-rightafter-terminal/testsource.scala b/test/files/neg/plugin-rightafter-terminal/testsource.scala
deleted file mode 100644
index 7af767b638..0000000000
--- a/test/files/neg/plugin-rightafter-terminal/testsource.scala
+++ /dev/null
@@ -1,4 +0,0 @@
-object Test extends Application {
-  println("rightafterterminal")
-}
-
diff --git a/test/files/neg/t2641.check b/test/files/neg/t2641.check
index 70123bfc58..07900d0796 100644
--- a/test/files/neg/t2641.check
+++ b/test/files/neg/t2641.check
@@ -9,10 +9,6 @@ t2641.scala:18: error: illegal inheritance;
  self-type ManagedSeq does not conform to scala.collection.TraversableView[A,ManagedSeqStrict[A]]'s selftype scala.collection.TraversableView[A,ManagedSeqStrict[A]]
         with TraversableView[A, ManagedSeqStrict[A]]
              ^
-t2641.scala:19: error: illegal inheritance;
- self-type ManagedSeq does not conform to scala.collection.TraversableViewLike[A,ManagedSeqStrict[A],<error>]'s selftype scala.collection.TraversableViewLike[A,Coll,This]
-        with TraversableViewLike[A, ManagedSeqStrict[A], ManagedSeq[A]]
-             ^
 t2641.scala:17: error: illegal inheritance;
  self-type ManagedSeq does not conform to ScalaObject's selftype ScalaObject
         extends ManagedSeqStrict[A]
@@ -29,11 +25,11 @@ t2641.scala:27: error: illegal inheritance; superclass Any
   trait Sliced extends Transformed[A] with super.Sliced {
                        ^
 t2641.scala:27: error: illegal inheritance; superclass Any
- is not a subclass of the superclass Object
+ is not a subclass of the superclass TraversableLike
  of the mixin trait Sliced
   trait Sliced extends Transformed[A] with super.Sliced {
                                                  ^
 t2641.scala:28: error: value managedIterator is not a member of ManagedSeq
     override def managedIterator = self.managedIterator slice (from, until)
                                         ^
-10 errors found
+9 errors found