refactor(resolve): delete update_resolution function #112758
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
|
Could you inline the only remaining use of |
rustbot
added
S-waiting-on-author
bvanjoi
force-pushed
the
clean-up-resolve
branch
from
3f35486
to
5f38abc
Compare
bvanjoi
force-pushed
the
clean-up-resolve
branch
from
5f38abc
to
894ab2c
Compare
bvanjoi
commented
Jun 18, 2023
bvanjoi
changed the title
update_resolution invocation
|
@bors r+ rollup |
bors
added
S-waiting-on-bors
matthiaskrgr
added a commit
to matthiaskrgr/rust
that referenced
this pull request
Jun 18, 2023
…henkov
refactor(resolve): delete update_resolution function
The `{ resolution.single_imports.remove(); }` code block does not modify the `binding` of this `resolution`. Therefore, the result of `resolution.binding()` before and after `let t = f(self, resolution)` will remain the same, and it will always satisfy the result: `_ if old_binding.is_some() => return t` or `None => return t`.
And then we delete the `update_resolution` function because it only called once.
r? `@petrochenkov`
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 18, 2023
…mpiler-errors Rollup of 6 pull requests Successful merges: - rust-lang#112537 (Don't record adjustments twice in `note_source_of_type_mismatch_constraint`) - rust-lang#112663 (cleanup azure leftovers) - rust-lang#112668 (Test `x.ps1` in `msvc` CI job) - rust-lang#112710 (Re-use the deref-pattern recursion instead of duplicating the logic) - rust-lang#112753 (Don't try to auto-bless 32-bit `mir-opt` tests on ARM Mac hosts) - rust-lang#112758 (refactor(resolve): delete update_resolution function) r? `@ghost` `@rustbot` modify labels: rollup
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jun 20, 2023
Revert rust-lang#112758 and add test case Fixes rust-lang#112831. Cannot unwrap `update_resolution` for `resolution.single_imports.remove(&Interned::new_unchecked(import));` because there is a relationship between the `Import` and `&NameBinding` in `NameResolution`. This issue caused by my unfamiliarity with the data structure and I apologize for it. This PR had been reverted, and test case have been added. r? `@Nilstrieb` cc `@petrochenkov`
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.
The
{ resolution.single_imports.remove(); }code block does not modify thebindingof thisresolution. Therefore, the result ofresolution.binding()before and afterlet t = f(self, resolution)will remain the same, and it will always satisfy the result:_ if old_binding.is_some() => return torNone => return t.And then we delete the
update_resolutionfunction because it only called once.r? @petrochenkov