Rename hir::Map::{get_,find_}parent_node to hir::Map::{,opt_}parent_id, and add hir::Map::{get,find}_parent
#106403
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
|
r? @cjgillot (rustbot has picked a reviewer for you, use r? to override) |
rustbot
added
S-waiting-on-review
|
Some changes occurred in src/tools/clippy cc @rust-lang/clippy |
This comment has been minimized.
This comment has been minimized.
|
Well I did something wrong @rustbot author |
rustbot
added
S-waiting-on-author
Noratrieb
reviewed
Jan 3, 2023
compiler-errors
force-pushed
the
rename-hir-methods
branch
from
0a57f5d to
b4f6ee9
Compare
mcol
reviewed
Jan 3, 2023
compiler/rustc_hir/src/hir.rs
Outdated
| @@ -3456,7 +3456,7 @@ impl<'hir> Node<'hir> { | |||
| /// ```ignore (illustrative) | |||
| /// ctor | |||
| /// .ctor_hir_id() | |||
| /// .and_then(|ctor_id| tcx.hir().find(tcx.hir().get_parent_node(ctor_id))) | |||
| /// .and_then(|ctor_id| tcx.hir().find_parent_node(ctor_id)) | |||
There was a problem hiding this comment.
At a glance, this seems incorrect.
There was a problem hiding this comment.
Can you be more specific?
get_parent_node(_: HirId) -> HirId was renamed to parent_id(_: HirId) -> HirId, and a new find_parent_node(_: HirId) -> Optiion<Node> was introduced.
There was a problem hiding this comment.
Didn't you introduce find_parent instead of find_parent_node?
r=me with the comment and PR title corrected.
There was a problem hiding this comment.
Wait -- what modification to the PR title do you want? Also mentioning adding {find,get}_parent?
edit: just did that.
compiler-errors
force-pushed
the
rename-hir-methods
branch
from
b4f6ee9 to
59c9517
Compare
compiler-errors
changed the title
hir::Map::{get_,find_}parent_node to hir::Map::{,opt_}parent_idhir::Map::{get_,find_}parent_node to hir::Map::{,opt_}parent_id, and add hir::Map::{get,find}_parent
|
@bors r=cjgillot |
|
📌 Commit 59c95178848867f7cfca35dc8ddf2a217ef641f6 has been approved by It is now in the queue for this repository. |
bors
added
S-waiting-on-bors
|
☔ The latest upstream changes (presumably #105752) made this pull request unmergeable. Please resolve the merge conflicts. |
bors
added
S-waiting-on-author
compiler-errors
force-pushed
the
rename-hir-methods
branch
from
59c9517 to
b1b19bd
Compare
|
@bors r=cjgillot |
bors
removed
the
S-waiting-on-author
bors
added
the
S-waiting-on-bors
compiler-errors
added a commit
to compiler-errors/rust
that referenced
this pull request
Jan 5, 2023
…, r=cjgillot
Rename `hir::Map::{get_,find_}parent_node` to `hir::Map::{,opt_}parent_id`, and add `hir::Map::{get,find}_parent`
The `hir::Map::get_parent_node` function doesn't return a `Node`, and I think that's quite confusing. Let's rename it to something that sounds more like something that gets the parent hir id => `hir::Map::parent_id`. Same with `find_parent_node` => `opt_parent_id`.
Also, combine `hir.get(hir.parent_id(hir_id))` and similar `hir.find(hir.parent_id(hir_id))` function into new functions that actually retrieve the parent node in one call. This last commit is the only one that might need to be looked at closely.
|
This is bitrotty @bors p=1 |
bors
added a commit
to rust-lang-ci/rust
that referenced
this pull request
Jan 5, 2023
…mpiler-errors Rollup of 6 pull requests Successful merges: - rust-lang#105846 (Account for return-position `impl Trait` in trait in `opt_suggest_box_span`) - rust-lang#106385 (Split `-Zchalk` flag into `-Ztrait-solver=(classic|chalk|next)` flag) - rust-lang#106403 (Rename `hir::Map::{get_,find_}parent_node` to `hir::Map::{,opt_}parent_id`, and add `hir::Map::{get,find}_parent`) - rust-lang#106462 (rustdoc: remove unnecessary wrapper around sidebar and mobile logos) - rust-lang#106464 (Update Fuchsia walkthrough with new configs) - rust-lang#106478 (Tweak wording of fn call with wrong number of args) Failed merges: r? `@ghost` `@rustbot` modify labels: rollup
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
hir::Map::get_parent_nodefunction doesn't return aNode, and I think that's quite confusing. Let's rename it to something that sounds more like something that gets the parent hir id =>hir::Map::parent_id. Same withfind_parent_node=>opt_parent_id.Also, combine
hir.get(hir.parent_id(hir_id))and similarhir.find(hir.parent_id(hir_id))function into new functions that actually retrieve the parent node in one call. This last commit is the only one that might need to be looked at closely.