diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2013-11-26 21:20:21 +0100 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2013-11-26 22:08:18 +0100 |
| commit | f30ae6149ddd4386debbf3a5650b1fc005ed00e9 (patch) | |
| tree | 47439b4fc83c6e27a38e1c1645bfbd6d860d08a4 /test/files/neg/applydynamic_sip.check | |
| parent | eee92c3aa6c1355a5aec97dd9adb2bd2fa61dc09 (diff) | |
| parent | 3629b645cc2b1403c51925dd9c696a57008c0ce2 (diff) | |
| download | scala-f30ae6149ddd4386debbf3a5650b1fc005ed00e9.tar.gz scala-f30ae6149ddd4386debbf3a5650b1fc005ed00e9.tar.bz2 scala-f30ae6149ddd4386debbf3a5650b1fc005ed00e9.zip | |
Merge remote-tracking branch 'origin/pr/3196' into merge/2.10.x-positions-to-master
Conflicts:
src/compiler/scala/tools/nsc/typechecker/Typers.scala
test/files/neg/applydynamic_sip.check
- Changes two calls from `.endOrPoint` to `.point`. The latter
is safe in master for both `Range`- and `OffsetPosition`s
- Updates checkfiles with unrelated position changes (constructors)
Diffstat (limited to 'test/files/neg/applydynamic_sip.check')
| -rw-r--r-- | test/files/neg/applydynamic_sip.check | 8 |
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? |