Merge branch 'master' into execution-context

Conflicts:
	src/library/scala/package.scala

1 files changed, 20 insertions, 0 deletions

diff --git a/test/files/run/reify_implicits.scala b/test/files/run/reify_implicits.scala
new file mode 100644
index 0000000000..953eabe6c2
--- /dev/null
+++ b/test/files/run/reify_implicits.scala
@@ -0,0 +1,20 @@
+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)
+  toolbox.runExpr(code.tree)
+}