summaryrefslogtreecommitdiff
path: root/test/files/pos/t7596/B_2.scala
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2015-01-29 10:23:06 +1000
committerJason Zaugg <jzaugg@gmail.com>2015-01-29 10:23:06 +1000
commit09f92d2b74badcdd989e9f17e60344e63b5483cf (patch)
treebc991e16497412c0c5ca291124ea9d27eb7e6069 /test/files/pos/t7596/B_2.scala
parentaf3881623cde655b37af77edb46b9e8c1b46b067 (diff)
parent7ba38a07916426314cc3bff6999f3992757e0b26 (diff)
downloadscala-09f92d2b74badcdd989e9f17e60344e63b5483cf.tar.gz
scala-09f92d2b74badcdd989e9f17e60344e63b5483cf.tar.bz2
scala-09f92d2b74badcdd989e9f17e60344e63b5483cf.zip
Merge commit '7ba38a0' into merge/2.11.x-to-2.12.x-20150129
Conflicts: build.number src/compiler/scala/tools/nsc/transform/ExtensionMethods.scala src/library/scala/collection/Iterator.scala versions.properties
Diffstat (limited to 'test/files/pos/t7596/B_2.scala')
-rw-r--r--test/files/pos/t7596/B_2.scala19
1 files changed, 19 insertions, 0 deletions
diff --git a/test/files/pos/t7596/B_2.scala b/test/files/pos/t7596/B_2.scala
new file mode 100644
index 0000000000..977e5c8bd1
--- /dev/null
+++ b/test/files/pos/t7596/B_2.scala
@@ -0,0 +1,19 @@
+object Test {
+ locally {
+ Sites: Config.driver.Table
+ }
+}
+
+// Under separate compilation, the pickler is foiled by the
+// overloaded term `Config.driver`, and results in:
+
+// qbin/scalac test/files/pos/t7596/A_1.scala && qbin/scalac -explaintypes test/files/pos/t7596/B_2.scala
+// test/files/pos/t7596/B_2.scala:3: error: type mismatch;
+// found : Sites.type
+// required: Config.driver.Table
+// Sites: Config.driver.Table
+// ^
+// Sites.type <: Config.driver.Table?
+// Driver.this.type = Config.driver.type?
+// false
+// false \ No newline at end of file