From 2b4cd6c11016d046affb1d4ae787f85c6be1deec Mon Sep 17 00:00:00 2001 From: Paul Phillips Date: Wed, 27 Mar 2013 10:09:27 -0700 Subject: SI-7302 importing from Any. Turns out the "minor tweaks" in 632daed4ed were only minor for major values of minor. You can indeed import members from Any/Object, so long as you rename them. Reverted logic error. Test case will accompany SI-7233 upon merge into master. --- src/reflect/scala/reflect/internal/Definitions.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/reflect/scala/reflect/internal/Definitions.scala b/src/reflect/scala/reflect/internal/Definitions.scala index 55954196f6..db6f05294b 100644 --- a/src/reflect/scala/reflect/internal/Definitions.scala +++ b/src/reflect/scala/reflect/internal/Definitions.scala @@ -244,8 +244,8 @@ trait Definitions extends api.StandardDefinitions { (sym eq NoSymbol) || sym.isConstructor || sym.isPrivateLocal - || isUniversalMember(sym) ) + def isUnimportableUnlessRenamed(sym: Symbol) = isUnimportable(sym) || isUniversalMember(sym) def isImportable(sym: Symbol) = !isUnimportable(sym) /** Is this type equivalent to Any, AnyVal, or AnyRef? */ -- cgit v1.2.3