store the segment name when resolution fails #119925
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
Noratrieb
approved these changes
Jan 13, 2024
There was a problem hiding this comment.
This seems reasonable to me, thank you very much for fixing this!
I'm going to approve this but also cc @petrochenkov in case you see anything obviously wrong with this, feel free to intervene or complain after this has been merged.
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
Noratrieb
added a commit
to Noratrieb/rust
that referenced
this pull request
Jan 13, 2024
store the segment name when resolution fails Fixes rust-lang#112672 The `find_cfg_stripped` does indeed get executed within `smart_resolve_report_errors`. However, this error is not reported as it is subsequently overridden by `parent_err`. (See: https://github.com/rust-lang/rust/blob/master/compiler/rustc_resolve/src/late.rs#L3760) This PR changes `last_segment` to `segment`, which stores the name of the failed resolution, and ensures that the result of `find_cfg_stripped` is also included in `parent_err`. r? `@Nilstrieb`
Noratrieb
added a commit
to Noratrieb/rust
that referenced
this pull request
Jan 13, 2024
store the segment name when resolution fails Fixes rust-lang#112672 The `find_cfg_stripped` does indeed get executed within `smart_resolve_report_errors`. However, this error is not reported as it is subsequently overridden by `parent_err`. (See: https://github.com/rust-lang/rust/blob/master/compiler/rustc_resolve/src/late.rs#L3760) This PR changes `last_segment` to `segment`, which stores the name of the failed resolution, and ensures that the result of `find_cfg_stripped` is also included in `parent_err`. r? ``@Nilstrieb``
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 13, 2024
…iaskrgr Rollup of 5 pull requests Successful merges: - rust-lang#119189 (Move section "Installing from Source" to seperate file) - rust-lang#119925 (store the segment name when resolution fails) - rust-lang#119935 (Move personality implementation out of PAL) - rust-lang#119937 (Improve UEFI target docs) - rust-lang#119938 (Allow unauthorized users to user the has-merge-commits label) r? `@ghost` `@rustbot` modify labels: rollup
rust-timer
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 14, 2024
Rollup merge of rust-lang#119925 - bvanjoi:fix-112672, r=Nilstrieb store the segment name when resolution fails Fixes rust-lang#112672 The `find_cfg_stripped` does indeed get executed within `smart_resolve_report_errors`. However, this error is not reported as it is subsequently overridden by `parent_err`. (See: https://github.com/rust-lang/rust/blob/master/compiler/rustc_resolve/src/late.rs#L3760) This PR changes `last_segment` to `segment`, which stores the name of the failed resolution, and ensures that the result of `find_cfg_stripped` is also included in `parent_err`. r? ```@Nilstrieb```
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.
Fixes #112672
The
find_cfg_strippeddoes indeed get executed within smart_resolve_report_errors. However, this error is not reported as it is subsequently overridden by parent_err. (See: https://github.com/rust-lang/rust/blob/master/compiler/rustc_resolve/src/late.rs#L3760)This PR changes
last_segmenttosegment, which stores the name of the failed resolution, and ensures that the result offind_cfg_strippedis also included in parent_err.r? @Nilstrieb