Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 0 insertions, 21 deletions

diff --git a/test/pending/run/reify_implicits.scala b/test/pending/run/reify_implicits.scala
deleted file mode 100644
index a15cef9c97..0000000000
--- a/test/pending/run/reify_implicits.scala
+++ /dev/null
@@ -1,21 +0,0 @@
-import scala.tools.nsc.reporters._
-import scala.tools.nsc.Settings
-import reflect.runtime.Mirror.ToolBox
-
-object Test extends App {
-  val code = scala.reflect.Code.lift{
-    implicit def arrayWrapper[A : ClassManifest](x: Array[A]) =
-      new {
-        def sort(p: (A, A) => Boolean) = {
-          util.Sorting.stableSort(x, p); x
-        }
-      }
-    val x = Array(2, 3, 1, 4)
-    println("x = "+ x.sort((x: Int, y: Int) => x < y).toList)
-  };
-
-  val reporter = new ConsoleReporter(new Settings)
-  val toolbox = new ToolBox(reporter)
-  val ttree = toolbox.typeCheck(code.tree)
-  toolbox.runExpr(ttree)
-}