Adopt scala's scheme for root import hiding #1901
Merged
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
scalac hides a root import from Predef if there is an eplicit Predef import. We now do the same (previously we did this only if the overriding import undefined something, using a `x => _` syntax). To avoid cycles and races one had to be very careful not to force import symbols too early, so we now compare the name before the symbol proper. All this is likely temporary - the comment of ImportInfo#unimported points to a different, more systematic solution.
smarter
approved these changes
Jan 15, 2017
| */ | ||
| class ImportInfo(symf: => Symbol, val selectors: List[untpd.Tree], val isRootImport: Boolean = false)(implicit ctx: Context) { | ||
| class ImportInfo(symf: => Symbol, val selectors: List[untpd.Tree], | ||
| symNameOpt: Option[TermName], val isRootImport: Boolean = false)(implicit ctx: Context) { | ||
|
|
There was a problem hiding this comment.
You could put a if (isRootImport) assert(symNameOpt.isEmpty) here to enforce what the documentation says.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
scalac hides a root import from Predef if there is an explicit Predef import.
We now do the same (previously we did this only if the overriding import undefined
something, using a
x => _syntax). To avoid cycles and races one had to be very carefulnot to force import symbols too early, so we now compare the name before the symbol proper.
All this is likely temporary - the comment of ImportInfo#unimported points to a different,
more systematic solution.
Note: The difference in semantics showed up and caused problems for the current collection strawman.