diff options
author | Jason Zaugg <jzaugg@gmail.com> | 2014-02-21 15:01:46 +0100 |
---|---|---|
committer | Jason Zaugg <jzaugg@gmail.com> | 2014-02-21 15:01:46 +0100 |
commit | d79fc2cae4e550bf0a3276a3961ed007bdd428e7 (patch) | |
tree | 8dd84da7c1648b7586f239ee3b66c5e515e9980c /test/files/neg | |
parent | e72f77be2e2c47e1f3905089e16c2ba4826de089 (diff) | |
parent | 4223bc2ddc497457c7dccd1b9b65e98244a9b4d1 (diff) | |
download | scala-d79fc2cae4e550bf0a3276a3961ed007bdd428e7.tar.gz scala-d79fc2cae4e550bf0a3276a3961ed007bdd428e7.tar.bz2 scala-d79fc2cae4e550bf0a3276a3961ed007bdd428e7.zip |
Merge pull request #3555 from adriaanm/rebase-3553
Small Predef cleanup
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/logImplicits.check | 2 | ||||
-rw-r--r-- | test/files/neg/predef-masking.scala | 2 | ||||
-rw-r--r-- | test/files/neg/t8229.check | 4 | ||||
-rw-r--r-- | test/files/neg/t8229.scala | 6 |
4 files changed, 12 insertions, 2 deletions
diff --git a/test/files/neg/logImplicits.check b/test/files/neg/logImplicits.check index 2265614962..270882b71a 100644 --- a/test/files/neg/logImplicits.check +++ b/test/files/neg/logImplicits.check @@ -10,7 +10,7 @@ logImplicits.scala:15: inferred view from String("abc") to Int = C.this.convert: logImplicits.scala:19: applied implicit conversion from Int(1) to ?{def ->: ?} = implicit def ArrowAssoc[A](self: A): ArrowAssoc[A] def f = (1 -> 2) + "c" ^ -logImplicits.scala:19: applied implicit conversion from (Int, Int) to ?{def +: ?} = implicit def StringAdd[A](self: A): StringAdd[A] +logImplicits.scala:19: applied implicit conversion from (Int, Int) to ?{def +: ?} = implicit def any2stringadd[A](self: A): any2stringadd[A] def f = (1 -> 2) + "c" ^ logImplicits.scala:22: error: class Un needs to be abstract, since method unimplemented is not defined diff --git a/test/files/neg/predef-masking.scala b/test/files/neg/predef-masking.scala index 6f4f4859d0..67b69aa169 100644 --- a/test/files/neg/predef-masking.scala +++ b/test/files/neg/predef-masking.scala @@ -1,5 +1,5 @@ // Testing predef masking -import Predef.{ StringAdd => _, _ } +import Predef.{ any2stringadd => _, _ } object StringPlusConfusion { // Would love to do something about this error message, but by the diff --git a/test/files/neg/t8229.check b/test/files/neg/t8229.check new file mode 100644 index 0000000000..cc504fa34e --- /dev/null +++ b/test/files/neg/t8229.check @@ -0,0 +1,4 @@ +t8229.scala:5: error: value + is not a member of Object + o + "" + ^ +one error found diff --git a/test/files/neg/t8229.scala b/test/files/neg/t8229.scala new file mode 100644 index 0000000000..91966311e2 --- /dev/null +++ b/test/files/neg/t8229.scala @@ -0,0 +1,6 @@ +import Predef.{any2stringadd => _, _} + +object Test { + val o = new Object() + o + "" +} |