-
Notifications
You must be signed in to change notification settings - Fork 12.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
fix(resolve): skip assertion judgment when NonModule is dummy #113168
Merged
Conversation
This file contains 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
Status: Awaiting review from the assignee but also interested parties.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
labels
Jun 29, 2023
That assert is too strict, IMO. If a dummy binding can get in the way during PathResult::NonModule(partial_res) => {
if no_ambiguity && partial_res.full_res() != Some(Res::Err) {
assert!(import.imported_module.get().is_none());
} Changing the |
rustbot
added
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Jun 30, 2023
bvanjoi
changed the title
fix(resolve): only use valid binding for
fix(resolve): skip assertion judgment when NonModule is dummy
Jul 1, 2023
innermost_result
@rustbot ready |
rustbot
added
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
and removed
S-waiting-on-author
Status: This is awaiting some action (such as code changes or more information) from the author.
labels
Jul 1, 2023
Thanks! |
bors
added
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
and removed
S-waiting-on-review
Status: Awaiting review from the assignee but also interested parties.
labels
Jul 1, 2023
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jul 1, 2023
…iaskrgr Rollup of 6 pull requests Successful merges: - rust-lang#113168 (fix(resolve): skip assertion judgment when NonModule is dummy) - rust-lang#113174 (Better messages for next on a iterator inside for loops) - rust-lang#113182 (Error when RPITITs' hidden types capture more lifetimes than their trait definitions) - rust-lang#113196 (Fix associated items effective visibility calculation for type privacy lints) - rust-lang#113226 (Fix try builds on the msvc builder) - rust-lang#113227 (Update cargo) r? `@ghost` `@rustbot` modify labels: rollup
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Labels
S-waiting-on-bors
Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
T-compiler
Relevant to the compiler team, which will review and decide on the PR/issue.
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.
Fixes #85992
Why #85992 panic
During
resolve_imports
, thepath_res
of the importissue_85992_extern_2::Outcome
is pointing toexternal::issue_85992_extern_2
instead ofcrate::issue_85992_extern_2
. As a resultimport.imported_module.set
had been executed.Attached 1: the state of
early_resolve_ident_in_lexical_scope
during theresolve_imports
foruse issue_85992_extern_2::Outcome
is as follows:visit_scopes
scope
result.binding
CrateRoot
ExternPrelude
issue_85992_extern_2
(external)However, during finalization for
issue_85992_extern_2::Outcome
, theinnermost_result
was pointed tocrate::issue_85992_extern_2
and no ambiguity was generated, leading to a panic.Attached 2: the state of
early_resolve_ident_in_lexical_scope
during thefinalize_import
foruse issue_85992_extern_2::Outcome
is as follows:visit_scopes
scope
result.binding
innermost_result
None
CrateRoot
use crate::issue_85992_extern_2
(introdcued by dummy)result
but with aSome
wapperExternPrelude
issue_85992_extern_2
(external)Try to solve
Skip assertion judgment when
NonModule
is dummyr? @petrochenkov