diff options
| author | Paul Phillips <paulp@improving.org> | 2013-01-24 16:40:18 -0800 |
|---|---|---|
| committer | Paul Phillips <paulp@improving.org> | 2013-01-24 16:40:18 -0800 |
| commit | bd78be0bed5ad00c3965120311df17f09e656f00 (patch) | |
| tree | fef7f46abe525908e71302fa76d80256e96f9642 /src/reflect | |
| parent | ac432bcde6b357194203d25df5f204ab8e426416 (diff) | |
| parent | 96ed055769483d661b09f346cd1641f956f3172a (diff) | |
| download | scala-bd78be0bed5ad00c3965120311df17f09e656f00.tar.gz scala-bd78be0bed5ad00c3965120311df17f09e656f00.tar.bz2 scala-bd78be0bed5ad00c3965120311df17f09e656f00.zip | |
Merge pull request #1954 from retronym/backport/1565
[backport] SI-6567 Warning for Option(implicitView(foo))
Diffstat (limited to 'src/reflect')
| -rw-r--r-- | src/reflect/scala/reflect/internal/Definitions.scala | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index 2a7b55cb5a..4bd0aca9c4 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -536,10 +536,12 @@ trait Definitions extends api.StandardDefinitions { lazy val ScalaLongSignatureAnnotation = requiredClass[scala.reflect.ScalaLongSignature] // Option classes - lazy val OptionClass: ClassSymbol = requiredClass[Option[_]] - lazy val SomeClass: ClassSymbol = requiredClass[Some[_]] - lazy val NoneModule: ModuleSymbol = requiredModule[scala.None.type] - lazy val SomeModule: ModuleSymbol = requiredModule[scala.Some.type] + lazy val OptionClass: ClassSymbol = requiredClass[Option[_]] + lazy val OptionModule: ModuleSymbol = requiredModule[scala.Option.type] + lazy val Option_apply = getMemberMethod(OptionModule, nme.apply) + lazy val SomeClass: ClassSymbol = requiredClass[Some[_]] + lazy val NoneModule: ModuleSymbol = requiredModule[scala.None.type] + lazy val SomeModule: ModuleSymbol = requiredModule[scala.Some.type] def compilerTypeFromTag(tt: ApiUniverse # WeakTypeTag[_]): Type = tt.in(rootMirror).tpe def compilerSymbolFromTag(tt: ApiUniverse # WeakTypeTag[_]): Symbol = tt.in(rootMirror).tpe.typeSymbol |