summaryrefslogtreecommitdiff
path: root/test/pending/neg
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2014-01-14 00:34:24 -0800
committerJason Zaugg <jzaugg@gmail.com>2014-01-14 00:34:24 -0800
commitef4c5d2f43e912b5562c1372228e9c6ec9f25bb0 (patch)
treebb7385f1971d1b7869eed8678fb0bfef24082e60 /test/pending/neg
parent4065b5136f2d0d1b6b9bb03f6669c1fd8a2b4e64 (diff)
parentb2f67b5730adccc4cbb24e5b542dc66452869489 (diff)
downloadscala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.tar.gz
scala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.tar.bz2
scala-ef4c5d2f43e912b5562c1372228e9c6ec9f25bb0.zip
Merge pull request #3355 from xeno-by/topic/saturday-night
reshuffles names for blackbox/whitebox contexts, changes bundle notation
Diffstat (limited to 'test/pending/neg')
-rw-r--r--test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala4
1 files changed, 2 insertions, 2 deletions
diff --git a/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala b/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala
index 89020de7dd..be47d5cec4 100644
--- a/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala
+++ b/test/pending/neg/macro-invalidusage-badbounds-b/Impls_1.scala
@@ -1,5 +1,5 @@
-import scala.reflect.macros.{Context => Ctx}
+import scala.reflect.macros.blackbox.Context
object Impls {
- def foo[U <: String](c: Ctx) = ???
+ def foo[U <: String](c: Context) = ???
}