diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2016-12-20 13:19:19 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2016-12-20 13:19:19 +1000 |
| commit | 079e8dc61704a768792c6b210a5b0cd25522ee55 (patch) | |
| tree | 37154f37a745c9c7535cbe0a7f6cef486beb5870 /test/files/neg/t1215.check | |
| parent | 56fb9172756d95ef903c36efcf54f1ae95c64b4b (diff) | |
| parent | 23548c4301e48cb69f05cd01ceba418dc9c36d6c (diff) | |
| download | scala-079e8dc61704a768792c6b210a5b0cd25522ee55.tar.gz scala-079e8dc61704a768792c6b210a5b0cd25522ee55.tar.bz2 scala-079e8dc61704a768792c6b210a5b0cd25522ee55.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20161220
Conflicts:
bincompat-backward.whitelist.conf
build.xml
src/compiler/scala/tools/nsc/typechecker/Typers.scala
src/library/scala/collection/immutable/NumericRange.scala
Diffstat (limited to 'test/files/neg/t1215.check')
| -rw-r--r-- | test/files/neg/t1215.check | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/test/files/neg/t1215.check b/test/files/neg/t1215.check index 1f9dd6bf38..4cbd0d85f3 100644 --- a/test/files/neg/t1215.check +++ b/test/files/neg/t1215.check @@ -1,4 +1,5 @@ t1215.scala:2: error: value += is not a member of Int + Expression does not convert to assignment because receiver is not assignable. val x = 1 += 1 ^ one error found |