diff options
author | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-08-24 11:36:36 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@typesafe.com> | 2015-08-24 11:36:36 +0200 |
commit | 3a543d64158e85b65f8998460c832362bdddec4f (patch) | |
tree | 665fc16d4932a6d8625fe28ae87c100bb1ee96c1 /test/files/run/constrained-types.check | |
parent | cd77e23b76af8538ed7e2c5c90e7845582dff460 (diff) | |
parent | ded2d4f2e613aad6670b3e5dccbab0feb711b18b (diff) | |
download | scala-3a543d64158e85b65f8998460c832362bdddec4f.tar.gz scala-3a543d64158e85b65f8998460c832362bdddec4f.tar.bz2 scala-3a543d64158e85b65f8998460c832362bdddec4f.zip |
Merge pull request #4700 from SethTisue/merge-2.11.x-aug-20
Merge 2.11.x aug 20 [ci: last-only]
Diffstat (limited to 'test/files/run/constrained-types.check')
-rw-r--r-- | test/files/run/constrained-types.check | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/test/files/run/constrained-types.check b/test/files/run/constrained-types.check index 670d6f49aa..5444cf2088 100644 --- a/test/files/run/constrained-types.check +++ b/test/files/run/constrained-types.check @@ -133,16 +133,16 @@ y: String = hello scala> scala> val x = 3 : Int @Annot(e+f+g+h) // should have a graceful error message -<console>:11: error: not found: value e +<console>:12: error: not found: value e val x = 3 : Int @Annot(e+f+g+h) // should have a graceful error message ^ -<console>:11: error: not found: value f +<console>:12: error: not found: value f val x = 3 : Int @Annot(e+f+g+h) // should have a graceful error message ^ -<console>:11: error: not found: value g +<console>:12: error: not found: value g val x = 3 : Int @Annot(e+f+g+h) // should have a graceful error message ^ -<console>:11: error: not found: value h +<console>:12: error: not found: value h val x = 3 : Int @Annot(e+f+g+h) // should have a graceful error message ^ |