Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Tweak parse_dot_suffix_expr #122858

Merged
merged 4 commits into from
Mar 25, 2024
Merged

Tweak parse_dot_suffix_expr #122858

merged 4 commits into from
Mar 25, 2024

Conversation

nnethercote
Copy link
Contributor

I find this function hard to understand, so I rewrote it.

r? @est31

@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 Mar 22, 2024
@nnethercote
Copy link
Contributor Author

Best reviewed one commit at a time.

est31
est31 reviewed Mar 24, 2024
View reviewed changes
Copy link
Member

@est31 est31 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

r+ me except for that comment point. maybe the original form can be preserved for grepability somehow, and the additional info can be included behind it?

@nnethercote
Inline and remove Parser::parse_expr_tuple_field_access_float.
42066b0 
It has a single call site, and afterwards all the calls to
`parse_expr_tuple_field_access` are in a single method, which is nice.
@nnethercote
Remove next_token handling from parse_expr_tuple_field_access.
90eeb3d 
It's clearer at the call site.
@nnethercote
Change parse_expr_tuple_field_access.
9c09116 
Pass in the span for the field rather than using `prev_token`.
Also rename it `mk_expr_tuple_field_access`, because it doesn't do any
actual parsing, it just creates an expression with what it's given.

Not much of a clarity win by itself, but unlocks additional subsequent
simplifications.
@nnethercote
Clarify parse_dot_suffix_expr.
dce0f7f 
For the `MiddleDot` case, current behaviour:
- For a case like `1.2`, `sym1` is `1` and `sym2` is `2`, and `self.token`
  holds `1.2`.
- It creates a new ident token from `sym1` that it puts into `self.token`.
- Then it does `bump_with` with a new dot token, which moves the `sym1`
  token into `prev_token`.
- Then it does `bump_with` with a new ident token from `sym2`, which moves the
  `dot` token into `prev_token` and discards the `sym1` token.
- Then it does `bump`, which puts whatever is next into `self.token`,
  moves the `sym2` token into `prev_token`, and discards the `dot` token
  altogether.

New behaviour:
- Skips creating and inserting the `sym1` and dot tokens, because they are
  unnecessary.
- This also demonstrates that the comment about `Spacing::Alone` is
  wrong -- that value is never used. That comment was added in rust-lang#77250,
  and AFAICT it has always been incorrect.

The commit also expands comments. I found this code hard to read
previously, the examples in comments make it easier.
@nnethercote nnethercote force-pushed the tweak-parse_dot_suffix_expr branch from 421d9c1 to dce0f7f Compare March 25, 2024 02:08
@nnethercote
Copy link
Contributor Author

I reinstated the original comments as requested.

@bors r=est31

@bors
Copy link
Contributor

bors commented Mar 25, 2024

📌 Commit dce0f7f has been approved by est31

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 Mar 25, 2024
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 25, 2024
@matthiaskrgr
Rollup merge of rust-lang#122858 - nnethercote:tweak-parse_dot_suffix…
05e9668 
…_expr, r=est31

Tweak `parse_dot_suffix_expr`

I find this function hard to understand, so I rewrote it.

r? `@est31`
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 25, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2024
@bors
Auto merge of rust-lang#123023 - matthiaskrgr:rollup-xtfciuv, r=matth…
33c0005 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#122802 (Provide structured suggestion for unconstrained generic constant)
 - rust-lang#122858 (Tweak `parse_dot_suffix_expr`)
 - rust-lang#122923 (In `pretty_print_type()`, print `async fn` futures' paths instead of spans.)
 - rust-lang#122990 (Clarify transmute example)
 - rust-lang#122995 (Clean up unnecessary headers/flags in coverage mir-opt tests)
 - rust-lang#123003 (CFI: Handle dyn with no principal)
 - rust-lang#123005 (CFI: Support complex receivers)
 - rust-lang#123020 (Temporarily remove nnethercote from the review rotation.)

r? `@ghost`
`@rustbot` modify labels: rollup
matthiaskrgr added a commit to matthiaskrgr/rust that referenced this pull request Mar 25, 2024
@matthiaskrgr
Rollup merge of rust-lang#122858 - nnethercote:tweak-parse_dot_suffix…
6ba2470 
…_expr, r=est31

Tweak `parse_dot_suffix_expr`

I find this function hard to understand, so I rewrote it.

r? ``@est31``
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 25, 2024
Closed
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2024
@bors
Auto merge of rust-lang#123027 - matthiaskrgr:rollup-nng7h3z, r=matth…
282915c 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120557 (Add rust-lldb pretty printing for Path and PathBuf)
 - rust-lang#122802 (Provide structured suggestion for unconstrained generic constant)
 - rust-lang#122858 (Tweak `parse_dot_suffix_expr`)
 - rust-lang#122990 (Clarify transmute example)
 - rust-lang#122995 (Clean up unnecessary headers/flags in coverage mir-opt tests)
 - rust-lang#123003 (CFI: Handle dyn with no principal)
 - rust-lang#123005 (CFI: Support complex receivers)
 - rust-lang#123020 (Temporarily remove nnethercote from the review rotation.)

r? `@ghost`
`@rustbot` modify labels: rollup
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2024
@bors
Auto merge of rust-lang#123027 - matthiaskrgr:rollup-nng7h3z, r=matth…
0ce30e7 
…iaskrgr

Rollup of 8 pull requests

Successful merges:

 - rust-lang#120557 (Add rust-lldb pretty printing for Path and PathBuf)
 - rust-lang#122802 (Provide structured suggestion for unconstrained generic constant)
 - rust-lang#122858 (Tweak `parse_dot_suffix_expr`)
 - rust-lang#122990 (Clarify transmute example)
 - rust-lang#122995 (Clean up unnecessary headers/flags in coverage mir-opt tests)
 - rust-lang#123003 (CFI: Handle dyn with no principal)
 - rust-lang#123005 (CFI: Support complex receivers)
 - rust-lang#123020 (Temporarily remove nnethercote from the review rotation.)

r? `@ghost`
`@rustbot` modify labels: rollup
@matthiaskrgr matthiaskrgr mentioned this pull request Mar 25, 2024
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2024
@bors
Auto merge of rust-lang#123029 - matthiaskrgr:rollup-6qsevhx, r=matth…
af98101 
…iaskrgr

Rollup of 7 pull requests

Successful merges:

 - rust-lang#122858 (Tweak `parse_dot_suffix_expr`)
 - rust-lang#122982 (Add more comments to the bootstrap code that handles `tests/coverage`)
 - rust-lang#122990 (Clarify transmute example)
 - rust-lang#122995 (Clean up unnecessary headers/flags in coverage mir-opt tests)
 - rust-lang#123003 (CFI: Handle dyn with no principal)
 - rust-lang#123005 (CFI: Support complex receivers)
 - rust-lang#123020 (Temporarily remove nnethercote from the review rotation.)

r? `@ghost`
`@rustbot` modify labels: rollup
@bors bors merged commit 4cae68b into rust-lang:master Mar 25, 2024
11 checks passed
@rustbot rustbot added this to the 1.79.0 milestone Mar 25, 2024
rust-timer added a commit to rust-lang-ci/rust that referenced this pull request Mar 25, 2024
@rust-timer
Unrolled build for rust-lang#122858
c8c42e4 
Rollup merge of rust-lang#122858 - nnethercote:tweak-parse_dot_suffix_expr, r=est31

Tweak `parse_dot_suffix_expr`

I find this function hard to understand, so I rewrote it.

r? ```@est31```
@ShE3py ShE3py mentioned this pull request Apr 7, 2024
Open
11 tasks
@nnethercote nnethercote deleted the tweak-parse_dot_suffix_expr branch April 15, 2024 23:22
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@est31 est31 est31 left review comments

Assignees

@est31 est31

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
Milestone
1.79.0
Development

Successfully merging this pull request may close these issues.
4 participants
@nnethercote @bors @est31 @rustbot