[WIP] Resolve: refactor define into define_local and define_extern
#143884
+349
−366
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
rustbot
added
S-waiting-on-author
| panic!("An external binding was already defined"); | ||
| } | ||
| // FIXME: maybe some handling of glob-importers | ||
| resolution.binding = Some(binding); |
There was a problem hiding this comment.
Everything passes but I still don't know what we should do here with glob-importers.
| @@ -477,7 +492,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { | |||
| if self.is_accessible_from(binding.vis, scope) { | |||
| let imported_binding = self.import(binding, *import); | |||
| let key = BindingKey { ident, ..key }; | |||
| let _ = self.try_define( | |||
| // FIXME: local or external? | |||
| let _ = self.try_define_local( | |||
There was a problem hiding this comment.
This is in update_resolutions, I don't know if this is an equivalent change.
| @@ -1078,7 +1078,7 @@ pub struct Resolver<'ra, 'tcx> { | |||
| extern_module_map: RefCell<FxIndexMap<DefId, Module<'ra>>>, | |||
| binding_parent_modules: FxHashMap<NameBinding<'ra>, Module<'ra>>, | |||
|
|
|||
| underscore_disambiguator: u32, | |||
| underscore_disambiguator: Cell<u32>, | |||
There was a problem hiding this comment.
This is correct, right?
| @@ -501,7 +517,8 @@ impl<'ra, 'tcx> Resolver<'ra, 'tcx> { | |||
| let dummy_binding = self.import(dummy_binding, import); | |||
| self.per_ns(|this, ns| { | |||
| let key = BindingKey::new(target, ns); | |||
| let _ = this.try_define(import.parent_scope.module, key, dummy_binding, false); | |||
| let _ = | |||
| this.try_define_local(import.parent_scope.module, key, dummy_binding, false); | |||
There was a problem hiding this comment.
Same concern as in update_resolutions.
|
☔ The latest upstream changes (presumably #143888) made this pull request unmergeable. Please resolve the merge conflicts. |
|
Conflicts must be resolved in Petrochenkov's PRS, I think. I can then rebase off that. |
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.
Follow up on #143550 and part of #gsoc > Project: Parallel Macro Expansion.
Split up
defineintodefine_localanddefine_extern. Refactor usages ofdefineinto either one where it's "correct" (idk if everything is correct atm). Big part of this is thatresolutioncan now take a&Resolverinstead of a mutable one.Needed the module changes of #143550. Review will probably be easier when viewing my first commit instead of all the changes.
r? @petrochenkov