Skip to content

Conversation

@smoelius
Copy link
Contributor

@smoelius smoelius commented Nov 2, 2022

Reorder the walk_ functions to match the order of the visit_ methods. This is a follow up to #103692.

Note that there are some oddballs. I put them where I thought made the most sense:

$ diff \
<(sed -n 's/^.*\<fn visit_\([^(]*\).*$/\1/;T;p' compiler/rustc_hir/src/intravisit.rs) \
<(sed -n 's/^.*\<fn walk_\([^<]*\).*$/\1/;T;p' compiler/rustc_hir/src/intravisit.rs)
1,5d0
< nested_item
< nested_trait_item
< nested_impl_item
< nested_foreign_item
< nested_body
9,10d3
< id
< name
20c13
< array_length
---
> array_len
30a24
> fn_ret_ty
31a26
> fn_kind
41c36
< variant_data
---
> struct_def
46c41
< infer
---
> inf
54d48
< attribute

Also, as some weak evidence that i did things correctly, I get the following before and after the change:

$ sort compiler/rustc_hir/src/intravisit.rs | openssl sha256
SHA256(stdin)= cac13d2545731ef442f318e2b4286490d7ac5494f4ad10c4cf4c5d4f50d21641

r? @fee1-dead

@rustbot 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 Nov 2, 2022
@fee1-dead
Copy link
Member

curl https://raw.githubusercontent.com/rust-lang/rust/2125181b7dc7a30634d2f60196c5a5c9108b2736/compiler/rustc_hir/src/intravisit.rs | sort | sha256sum
cac13d2545731ef442f318e2b4286490d7ac5494f4ad10c4cf4c5d4f50d21641  -

curl https://raw.githubusercontent.com/rust-lang/rust/e6043272863e836a513b3d914eb66e1965d2f14a/compiler/rustc_hir/src/intravisit.rs | sort | sha256sum

cac13d2545731ef442f318e2b4286490d7ac5494f4ad10c4cf4c5d4f50d21641  -

Looks good to me.

@bors r+

@bors
Copy link
Collaborator

bors commented Nov 2, 2022

📌 Commit e604327 has been approved by fee1-dead

It is now in the queue for this repository.

@bors 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 Nov 2, 2022
@spastorino
Copy link
Member

@bors rollup

bors added a commit to rust-lang-ci/rust that referenced this pull request Nov 2, 2022
Rollup of 7 pull requests

Successful merges:

 - rust-lang#103275 (Update tinystr)
 - rust-lang#103703 (Gate some parser recovery behind the check)
 - rust-lang#103774 (Format `dyn Trait` better in `type_name` intrinsic)
 - rust-lang#103807 (Add tracking issue for `string_extend_from_within`)
 - rust-lang#103855 (rustdoc: simplify mobile item-table CSS)
 - rust-lang#103862 (Use `ObligationCtxt` in `fully_normalize`)
 - rust-lang#103864 (Reorder `walk_` functions in intravisit.rs)

Failed merges:

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 5a288dc into rust-lang:master Nov 2, 2022
@rustbot rustbot added this to the 1.67.0 milestone Nov 2, 2022
@smoelius smoelius deleted the reorder-walk-functions branch November 2, 2022 20:51
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.

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants