diff options
| author | Jason Zaugg <jzaugg@gmail.com> | 2015-05-01 15:33:30 +1000 |
|---|---|---|
| committer | Jason Zaugg <jzaugg@gmail.com> | 2015-05-01 15:33:30 +1000 |
| commit | e596d1a65d81a81a54847d90d2d90be3ffbb3d92 (patch) | |
| tree | d6c86e80b08b47271e65bccfe734e80bc531be8f /test/files/pos | |
| parent | 4210262867a541d4cbf0aaf2b06bedeef9520c2b (diff) | |
| parent | 6a185e3c97b79716576725f1ecf0ba629e83951d (diff) | |
| download | scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.gz scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.tar.bz2 scala-e596d1a65d81a81a54847d90d2d90be3ffbb3d92.zip | |
Merge remote-tracking branch 'origin/2.11.x' into merge/2.11.x-to-2.12.x-20150501
Diffstat (limited to 'test/files/pos')
| -rw-r--r-- | test/files/pos/t7815.scala | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/test/files/pos/t7815.scala b/test/files/pos/t7815.scala index 12a434c5b0..0a126f9faa 100644 --- a/test/files/pos/t7815.scala +++ b/test/files/pos/t7815.scala @@ -21,7 +21,7 @@ object Foo { object Main extends App { def mapWithFoo[A <: AnyRef, B](as: List[A])(implicit foo: Foo.Aux[A, B]) = { // Should be Eta expandable because the result type of `f` is not - // dependant on the value, it is just `B`. + // dependent on the value, it is just `B`. as map foo.f as map foo.g as map foo.m |