Skip to content

Still more refactoring of parse_tt #95067

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
Merged
merged 6 commits into from
Mar 18, 2022
Merged

Still more refactoring of parse_tt #95067

merged 6 commits into from
Mar 18, 2022

Conversation

nnethercote
Copy link
Contributor

@nnethercote
Add two useful assertions.
5bbbee5
@nnethercote
Factor out some code into MatcherPos::repetition.
8bd1bca 
Also move `create_matches` within `impl MatcherPos`, because it's only
used within that impl block.
@nnethercote
Only modify eof_items if token == Eof.
8304471 
Because that's the condition under which `eof_items` is used.
@nnethercote
Reorder cases in parse_tt_inner.
14875a5 
I find the new order easier to read: within a matcher; past the end of a
repetition; at end of input. It also reduces the indentation level by
one for
@nnethercote
Tweak a bunch of comments.
f43028d 
I've been staring at these enough lately that they're annoying me, let's
make them better.
@nnethercote
Rename TtSeq as TtSlice.
440a685 
It's a better name because (a) it holds a slice, and (b) "sequence" has
other meanings in this file.
@rustbot rustbot added the T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. label Mar 18, 2022
@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Mar 18, 2022
@petrochenkov
Copy link
Contributor

@bors r+

@bors
Copy link
Collaborator

bors commented Mar 18, 2022

📌 Commit 440a685 has been approved by petrochenkov

@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 18, 2022
@bors
Copy link
Collaborator

bors commented Mar 18, 2022

⌛ Testing commit 440a685 with merge a8adf76...

@bors
Copy link
Collaborator

bors commented Mar 18, 2022

☀️ Test successful - checks-actions
Approved by: petrochenkov
Pushing a8adf76 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Mar 18, 2022
@bors bors merged commit a8adf76 into rust-lang:master Mar 18, 2022
@rustbot rustbot added this to the 1.61.0 milestone Mar 18, 2022
@rust-timer
Copy link
Collaborator

Finished benchmarking commit (a8adf76): comparison url.

Summary: This benchmark run did not return any relevant results.

If you disagree with this performance assessment, please file an issue in rust-lang/rustc-perf.

@rustbot label: -perf-regression

@nnethercote nnethercote deleted the parse_tt-more-refactoring branch March 18, 2022 20:18
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
merged-by-bors This PR was explicitly merged by bors. 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.61.0
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @petrochenkov @bors @rust-timer @rust-highfive @rustbot