summaryrefslogtreecommitdiff
path: root/test/files/run/t7700.check
diff options
context:
space:
mode:
authorLukas Rytz <lukas.rytz@typesafe.com>2016-06-29 10:26:35 +0200
committerGitHub <noreply@github.com>2016-06-29 10:26:35 +0200
commit79e24d52af441e728bf0c09fc054a00db693e07d (patch)
tree36ef9af07fc6b2296e678459525bee3f4f55e861 /test/files/run/t7700.check
parent7a7fdac795bdee3e05cda1327a570e59fbc9ce00 (diff)
parentd8c862b225cc7936e475419abaabb07226fea568 (diff)
downloadscala-79e24d52af441e728bf0c09fc054a00db693e07d.tar.gz
scala-79e24d52af441e728bf0c09fc054a00db693e07d.tar.bz2
scala-79e24d52af441e728bf0c09fc054a00db693e07d.zip
Merge pull request #5251 from adriaanm/rebase-5177
Emit trait method bodies in statics [rebase of #5177]
Diffstat (limited to 'test/files/run/t7700.check')
-rw-r--r--test/files/run/t7700.check5
1 files changed, 3 insertions, 2 deletions
diff --git a/test/files/run/t7700.check b/test/files/run/t7700.check
index 1d51e68877..7d18dbfcb4 100644
--- a/test/files/run/t7700.check
+++ b/test/files/run/t7700.check
@@ -1,3 +1,4 @@
-public default void C.$init$()
+public static void C.$init$(C)
public default java.lang.Object C.bar(java.lang.Object)
-public abstract java.lang.Object C.foo(java.lang.Object)
+public static java.lang.Object C.bar$(C,java.lang.Object)
+public abstract java.lang.Object C.foo(java.lang.Object) \ No newline at end of file