summaryrefslogtreecommitdiff
path: root/test/files/neg
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2013-11-26 23:15:18 -0800
committerJason Zaugg <jzaugg@gmail.com>2013-11-26 23:15:18 -0800
commit073ebbd20ce9775260b83a78ecf9ed6a3e6d3d9e (patch)
tree54774da32b079d290c48a4f2e7ea2e7915ecb45e /test/files/neg
parenta6f758202ada377888563d51915119a386dd6b3e (diff)
parentf30ae6149ddd4386debbf3a5650b1fc005ed00e9 (diff)
downloadscala-073ebbd20ce9775260b83a78ecf9ed6a3e6d3d9e.tar.gz
scala-073ebbd20ce9775260b83a78ecf9ed6a3e6d3d9e.tar.bz2
scala-073ebbd20ce9775260b83a78ecf9ed6a3e6d3d9e.zip
Merge pull request #3197 from retronym/merge/2.10.x-positions-to-master
Merge 2.10.x, and PR #3196, to master
Diffstat (limited to 'test/files/neg')
-rw-r--r--test/files/neg/applydynamic_sip.check8
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/neg/applydynamic_sip.check b/test/files/neg/applydynamic_sip.check
index f28f26c147..2cb2e7f095 100644
--- a/test/files/neg/applydynamic_sip.check
+++ b/test/files/neg/applydynamic_sip.check
@@ -22,21 +22,21 @@ applydynamic_sip.scala:18: error: type mismatch;
error after rewriting to Test.this.bad1.selectDynamic("sel")
possible cause: maybe a wrong Dynamic method signature?
bad1.sel
- ^
+ ^
applydynamic_sip.scala:19: error: type mismatch;
found : String("sel")
required: Int
error after rewriting to Test.this.bad1.applyDynamic("sel")
possible cause: maybe a wrong Dynamic method signature?
bad1.sel(1)
- ^
+ ^
applydynamic_sip.scala:20: error: type mismatch;
found : String("sel")
required: Int
error after rewriting to Test.this.bad1.applyDynamicNamed("sel")
possible cause: maybe a wrong Dynamic method signature?
bad1.sel(a = 1)
- ^
+ ^
applydynamic_sip.scala:20: error: reassignment to val
bad1.sel(a = 1)
^
@@ -46,7 +46,7 @@ applydynamic_sip.scala:21: error: type mismatch;
error after rewriting to Test.this.bad1.updateDynamic("sel")
possible cause: maybe a wrong Dynamic method signature?
bad1.sel = 1
- ^
+ ^
applydynamic_sip.scala:29: error: Int does not take parameters
error after rewriting to Test.this.bad2.selectDynamic("sel")
possible cause: maybe a wrong Dynamic method signature?