summaryrefslogtreecommitdiff
path: root/test/files
diff options
context:
space:
mode:
authorJason Zaugg <jzaugg@gmail.com>2016-11-29 10:34:55 +1000
committerGitHub <noreply@github.com>2016-11-29 10:34:55 +1000
commit57d98fda843d3b23757b48e0c6eebb7bd8eedc5d (patch)
tree3cf3cb849cab40d1966ad118e72c95ab658dcf3e /test/files
parent690ba800ec04f05c0f5e5e369863ab5b9578d42f (diff)
parent831fc01ecc81228267d3a6446542ec0467286803 (diff)
downloadscala-57d98fda843d3b23757b48e0c6eebb7bd8eedc5d.tar.gz
scala-57d98fda843d3b23757b48e0c6eebb7bd8eedc5d.tar.bz2
scala-57d98fda843d3b23757b48e0c6eebb7bd8eedc5d.zip
Merge pull request #5529 from lrytz/sd259
Better inliner support for 2.12 trait encoding
Diffstat (limited to 'test/files')
-rw-r--r--test/files/neg/sealed-final-neg.check6
1 files changed, 4 insertions, 2 deletions
diff --git a/test/files/neg/sealed-final-neg.check b/test/files/neg/sealed-final-neg.check
index e135f38f8b..5e47c69ed8 100644
--- a/test/files/neg/sealed-final-neg.check
+++ b/test/files/neg/sealed-final-neg.check
@@ -1,7 +1,9 @@
-sealed-final-neg.scala:17: warning: neg1/Foo::bar(I)I is annotated @inline but cannot be inlined: the method is not final and may be overridden.
+sealed-final-neg.scala:17: warning: neg1/Foo::bar(I)I is annotated @inline but could not be inlined:
+The method is not final and may be overridden.
def f = Foo.mkFoo() bar 10
^
-sealed-final-neg.scala:37: warning: neg2/Foo::bar(I)I is annotated @inline but cannot be inlined: the method is not final and may be overridden.
+sealed-final-neg.scala:37: warning: neg2/Foo::bar(I)I is annotated @inline but could not be inlined:
+The method is not final and may be overridden.
def f = Foo.mkFoo() bar 10
^
error: No warnings can be incurred under -Xfatal-warnings.