diff options
author | Paul Phillips <paulp@improving.org> | 2013-03-27 10:09:27 -0700 |
---|---|---|
committer | Paul Phillips <paulp@improving.org> | 2013-03-27 10:09:38 -0700 |
commit | 2b4cd6c11016d046affb1d4ae787f85c6be1deec (patch) | |
tree | da776184d29f4b23fda15a5d436e4b347db8d594 | |
parent | 79b18ccf9e9e9cb167ef9c2bdaf7e5adfa9a0ef0 (diff) | |
download | scala-2b4cd6c11016d046affb1d4ae787f85c6be1deec.tar.gz scala-2b4cd6c11016d046affb1d4ae787f85c6be1deec.tar.bz2 scala-2b4cd6c11016d046affb1d4ae787f85c6be1deec.zip |
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.
-rw-r--r-- | src/reflect/scala/reflect/internal/Definitions.scala | 2 |
1 files changed, 1 insertions, 1 deletions
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? */ |