diff options
author | James Iry <jamesiry@gmail.com> | 2013-08-26 09:29:35 -0700 |
---|---|---|
committer | James Iry <jamesiry@gmail.com> | 2013-08-26 09:29:35 -0700 |
commit | ba86ac61f489573d10590c5fc601e73673f204f1 (patch) | |
tree | 192ce37d6fad25c18b93408aaa31936ea687a711 /test/files/neg | |
parent | 9600d2b7432ddde7c19ecf672ad3247615bd6475 (diff) | |
parent | bc6d4b5c1d6746528fd442d8504f30909d7e6067 (diff) | |
download | scala-ba86ac61f489573d10590c5fc601e73673f204f1.tar.gz scala-ba86ac61f489573d10590c5fc601e73673f204f1.tar.bz2 scala-ba86ac61f489573d10590c5fc601e73673f204f1.zip |
Merge pull request #2860 from retronym/merge/2.10.2-to-2.10.x
Merge/2.10.2 to 2.10.x
Diffstat (limited to 'test/files/neg')
-rw-r--r-- | test/files/neg/t7441.check | 6 | ||||
-rw-r--r-- | test/files/neg/t7441.scala | 7 | ||||
-rw-r--r-- | test/files/neg/t7509.check | 12 | ||||
-rw-r--r-- | test/files/neg/t7509.scala | 4 |
4 files changed, 16 insertions, 13 deletions
diff --git a/test/files/neg/t7441.check b/test/files/neg/t7441.check deleted file mode 100644 index f259457197..0000000000 --- a/test/files/neg/t7441.check +++ /dev/null @@ -1,6 +0,0 @@ -t7441.scala:4: error: type mismatch; - found : Int(1) - required: List[Any] - def test = apply(1) - ^ -one error found diff --git a/test/files/neg/t7441.scala b/test/files/neg/t7441.scala deleted file mode 100644 index dad7421e3f..0000000000 --- a/test/files/neg/t7441.scala +++ /dev/null @@ -1,7 +0,0 @@ -object Test { - object Bar { - def apply(xs: List[Any]): Int = 0 - def test = apply(1) - } - implicit def foo = 1 -} diff --git a/test/files/neg/t7509.check b/test/files/neg/t7509.check new file mode 100644 index 0000000000..eaa6303cf5 --- /dev/null +++ b/test/files/neg/t7509.check @@ -0,0 +1,12 @@ +t7509.scala:3: error: inferred type arguments [Int] do not conform to method crash's type parameter bounds [R <: AnyRef] + crash(42) + ^ +t7509.scala:3: error: type mismatch; + found : Int(42) + required: R + crash(42) + ^ +t7509.scala:3: error: could not find implicit value for parameter ev: R + crash(42) + ^ +three errors found diff --git a/test/files/neg/t7509.scala b/test/files/neg/t7509.scala new file mode 100644 index 0000000000..3cba801ea7 --- /dev/null +++ b/test/files/neg/t7509.scala @@ -0,0 +1,4 @@ +object NMWE { + def crash[R <: AnyRef](f: R)(implicit ev: R): Any = ??? + crash(42) +} |