diff options
author | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-18 10:33:28 +0200 |
---|---|---|
committer | Lukas Rytz <lukas.rytz@gmail.com> | 2015-09-18 10:33:28 +0200 |
commit | 133e7d053cc62ce0703d611e34fa750175cc3b48 (patch) | |
tree | 918e2dd3d8523f41ad8b1da4cf09b5580a13bd25 /test/files/pos/t2405.scala | |
parent | 91cd6d1a3db422c576f15eceb0715c572ec44081 (diff) | |
parent | 76269ca7a63848aee1f141da75be8ca436bf9e6c (diff) | |
download | scala-133e7d053cc62ce0703d611e34fa750175cc3b48.tar.gz scala-133e7d053cc62ce0703d611e34fa750175cc3b48.tar.bz2 scala-133e7d053cc62ce0703d611e34fa750175cc3b48.zip |
Merge remote-tracking branch 'upstream/2.12.x' into opt/heuristics
Diffstat (limited to 'test/files/pos/t2405.scala')
-rw-r--r-- | test/files/pos/t2405.scala | 4 |
1 files changed, 2 insertions, 2 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} |