fix(resolve): update shadowed_glob more precision #112495
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
rustbot
added
S-waiting-on-review
bvanjoi
commented
Jun 11, 2023
petrochenkov
added
S-waiting-on-author
bvanjoi
commented
Jun 13, 2023
bvanjoi
commented
Jun 13, 2023
bvanjoi
changed the title
shadowed_glob when there had diff res for TypeNS
|
All checks had passed, so @rustbot ready |
rustbot
added
S-waiting-on-review
petrochenkov
added
S-waiting-on-author
bvanjoi
commented
Jun 13, 2023
bvanjoi
changed the title
tests/ui/resolve/issue-105069.stderr
Outdated
There was a problem hiding this comment.
Looks like you just fixed this FIXME - https://github.com/rust-lang/rust/pull/112086/files#diff-54ebaa0715c94a2acf974077e838aa584186e187f3d01edb1791fd71c78408caR937-R939 and we can now remove AmbiguityKind::Import in #112086.
This comment has been minimized.
This comment has been minimized.
|
@bors r+ |
bors
added
S-waiting-on-bors
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 14, 2023
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#112197 (Erase regions even if normalization fails in writeback (in new solver)) - rust-lang#112495 (fix(resolve): update shadowed_glob more precision) - rust-lang#112520 (Fix the overflow issue for transmute_generic_consts) - rust-lang#112571 (rustdoc-search: search never type with `!`) - rust-lang#112581 ([rustdoc] Fix URL encoding of % sign) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
5 participants
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.
inconsistent resolution for an import#109153assertion failed: import.imported_module.get().is_none()'#109962Why does it panic?
We use #109153 as an illustration.
The process of
resolve_importsis:(Mod(root), Ident(bar) in type ns)use foo::*binding-> foo::bar,shallowed_glob->Noneuse bar::barbinding-> foo::bar::bar,shallowed_glob-> foo::baruse bar::*binding-> foo::bar::bar,shallowed_glob-> foo::bar::bar::barSo during
finalize_import, theroot::barinuse bar::barhad been pointed tofoo::bar::bar::bar, which is different from theinitial_modulevalued offoo::bar, therefore, the panic had been triggered.Try to solve it
I think #109153 should check-pass rather than throw an ambiguous error. Following this idea, there are two ways to solve this problem:1. Give up theinitial_moduleand updateimport.imported_moduleafter each resolution update. However, I think this method may have too much impact.2. Do not update theshadowed_globwhen it is defined.To be honest, I am not sure if this is the right way to solve this ICE. Perhaps there is a better resolution.Edit: we had made the
resolution.shadowed_globupdate more detailed.r? @petrochenkov