diff options
| author | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-10-02 08:46:20 -0700 |
|---|---|---|
| committer | Grzegorz Kossakowski <grzegorz.kossakowski@gmail.com> | 2012-10-02 08:46:20 -0700 |
| commit | e93ca3231798241baf0f48ad361c0aa9668ee871 (patch) | |
| tree | 6ac43b178afd549651546af3762ffa02bc82acbf /test/files/neg | |
| parent | 5ac896d7c512b7858c2558bae6b3bd95f5dd5bde (diff) | |
| parent | 32e70a01da1fda7bdc91d7301ee3b8707fd2bcd4 (diff) | |
| download | scala-e93ca3231798241baf0f48ad361c0aa9668ee871.tar.gz scala-e93ca3231798241baf0f48ad361c0aa9668ee871.tar.bz2 scala-e93ca3231798241baf0f48ad361c0aa9668ee871.zip | |
Merge pull request #1430 from paulp/SI-5859-5353-4729
Fixes for SI-5859, SI-5353, SI-4729.
Diffstat (limited to 'test/files/neg')
| -rw-r--r-- | test/files/neg/t5353.check | 4 | ||||
| -rw-r--r-- | test/files/neg/t5353.scala | 3 | ||||
| -rw-r--r-- | test/files/neg/t5692a.check | 2 | ||||
| -rw-r--r-- | test/files/neg/t5692b.check | 2 |
4 files changed, 9 insertions, 2 deletions
diff --git a/test/files/neg/t5353.check b/test/files/neg/t5353.check new file mode 100644 index 0000000000..75e2435600 --- /dev/null +++ b/test/files/neg/t5353.check @@ -0,0 +1,4 @@ +t5353.scala:2: error: this type parameter must be specified + def f(x: Boolean) = if (x) Array("abc") else Array() + ^ +one error found diff --git a/test/files/neg/t5353.scala b/test/files/neg/t5353.scala new file mode 100644 index 0000000000..1ee869aac1 --- /dev/null +++ b/test/files/neg/t5353.scala @@ -0,0 +1,3 @@ +class A { + def f(x: Boolean) = if (x) Array("abc") else Array() +} diff --git a/test/files/neg/t5692a.check b/test/files/neg/t5692a.check index ded95a8820..7fbfb5dba7 100644 --- a/test/files/neg/t5692a.check +++ b/test/files/neg/t5692a.check @@ -1,4 +1,4 @@ -Test_2.scala:2: error: type parameter not specified +Test_2.scala:2: error: this type parameter must be specified def x = Macros.foo ^ one error found diff --git a/test/files/neg/t5692b.check b/test/files/neg/t5692b.check index e453870ec8..16796826b4 100644 --- a/test/files/neg/t5692b.check +++ b/test/files/neg/t5692b.check @@ -1,4 +1,4 @@ -Test_2.scala:2: error: type parameters not specified +Test_2.scala:2: error: these type parameters must be specified def x = Macros.foo ^ one error found |