diff options
author | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-09-09 09:31:22 -0700 |
---|---|---|
committer | Adriaan Moors <adriaan.moors@typesafe.com> | 2015-09-09 09:31:22 -0700 |
commit | 76269ca7a63848aee1f141da75be8ca436bf9e6c (patch) | |
tree | 3be0d1b978019ca825262a48bc4e18a34bdbf3f4 /test/files/pos | |
parent | 17099706034d3ae2c63743488f076ed1dab286b7 (diff) | |
parent | ad17b552b8f7c3a435ad8de71cd7268f905a1b8d (diff) | |
download | scala-76269ca7a63848aee1f141da75be8ca436bf9e6c.tar.gz scala-76269ca7a63848aee1f141da75be8ca436bf9e6c.tar.bz2 scala-76269ca7a63848aee1f141da75be8ca436bf9e6c.zip |
Merge pull request #4732 from SethTisue/merge-2.11.x-sep-8
Merge 2.11.x into 2.12.x [ci: last-only]
Diffstat (limited to 'test/files/pos')
-rw-r--r-- | test/files/pos/t2405.scala | 4 | ||||
-rw-r--r-- | test/files/pos/t8002-nested-scope.scala | 2 | ||||
-rw-r--r-- | test/files/pos/t9442.scala | 14 |
3 files changed, 17 insertions, 3 deletions
diff --git a/test/files/pos/t2405.scala b/test/files/pos/t2405.scala index 224b2ce83b..0bc7a771b2 100644 --- a/test/files/pos/t2405.scala +++ b/test/files/pos/t2405.scala @@ -6,14 +6,14 @@ object Test1 { implicitly[Int] } -// Testing for the absense of shadowing #1. +// Testing for the absence of shadowing #1. object Test2 { import A.{x => y} val x = 2 implicitly[Int] } -// Testing for the absense of shadowing #2. +// Testing for the absence of shadowing #2. object Test3 { { import A.{x => y} diff --git a/test/files/pos/t8002-nested-scope.scala b/test/files/pos/t8002-nested-scope.scala index a2088bce7a..8ce809e556 100644 --- a/test/files/pos/t8002-nested-scope.scala +++ b/test/files/pos/t8002-nested-scope.scala @@ -1,5 +1,5 @@ // This test serves to capture the status quo, but should really -// emit an accessibiltiy error. +// emit an accessibility error. // `Namers#companionSymbolOf` seems too lenient, and currently doesn't // implement the same-scope checks mentioned: diff --git a/test/files/pos/t9442.scala b/test/files/pos/t9442.scala new file mode 100644 index 0000000000..2ea81e79cb --- /dev/null +++ b/test/files/pos/t9442.scala @@ -0,0 +1,14 @@ +trait Ctx { + trait Tree +} +trait Lst[+A] { + def zip[A1 >: A, B](that: Lst[B]): Nothing +} +class C[@specialized(Int) T] { + def moo(t: T) = { + def foo1(c: Ctx)(l: Lst[c.Tree]) = l zip l + def foo2(c: Ctx)(l: Lst[c.Tree]*) = l(0) zip l(1) + def foo3(c: Ctx)(l: => Lst[c.Tree]) = l zip l + ??? + } +} |