Skip to content

Use an empty TokenCursorFrame stack when capturing tokens - #80830

Merged
bors merged 1 commit into
rust-lang:masterfrom
Aaron1011:capture-token-empty-stack
Jan 9, 2021
Merged

Use an empty TokenCursorFrame stack when capturing tokens#80830
bors merged 1 commit into
rust-lang:masterfrom
Aaron1011:capture-token-empty-stack

Conversation

@Aaron1011

@Aaron1011Aaron1011 commented Jan 8, 2021

Copy link
Copy Markdown
Contributor

We will never need to pop past our starting frame during token
capturing. Using an empty stack allows us to avoid pointless heap
allocations/deallocations.

@Aaron1011
Use an empty TokenCursorFrame stack when capturing tokens
7b36408
We will never need to pop past our starting frame during token
capturing. Using an empty stack allows us to avoid pointless heap
allocations/deallocations.
@rust-highfive

rust-highfive commented Jan 8, 2021

Copy link
Copy Markdown
Contributor

r? @ecstatic-morse

(rust-highfive has picked a reviewer for you, use r? to override)

@rust-highfiverust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jan 8, 2021
@Aaron1011

Aaron1011 commented Jan 8, 2021

Copy link
Copy Markdown
ContributorAuthor

@bors try @rust-timer queue

@rust-timer

rust-timer commented Jan 8, 2021

Copy link
Copy Markdown
Collaborator

Awaiting bors try build completion.

@bors

bors commented Jan 8, 2021

Copy link
Copy Markdown
Collaborator

⌛ Trying commit 7b36408 with merge e63d87c7d985a3b28c39a68e1772b35a5cc24e72...

@bors

bors commented Jan 9, 2021

Copy link
Copy Markdown
Collaborator

☀️ Try build successful - checks-actions
Build commit: e63d87c7d985a3b28c39a68e1772b35a5cc24e72 (e63d87c7d985a3b28c39a68e1772b35a5cc24e72)

@rust-timer

rust-timer commented Jan 9, 2021

Copy link
Copy Markdown
Collaborator

Queued e63d87c7d985a3b28c39a68e1772b35a5cc24e72 with parent 26438b4, future comparison URL.

@rustbot label: +S-waiting-on-perf

@rustbotrustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 9, 2021
@rust-timer

rust-timer commented Jan 9, 2021

Copy link
Copy Markdown
Collaborator

Finished benchmarking try commit (e63d87c7d985a3b28c39a68e1772b35a5cc24e72): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbotrustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jan 9, 2021
@petrochenkov

petrochenkov commented Jan 9, 2021

Copy link
Copy Markdown
Contributor

r? @petrochenkov

@petrochenkov

petrochenkov commented Jan 9, 2021

Copy link
Copy Markdown
Contributor

@bors r+

@bors

bors commented Jan 9, 2021

Copy link
Copy Markdown
Collaborator

📌 Commit 7b36408 has been approved by petrochenkov

@borsbors 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 Jan 9, 2021
@bors

bors commented Jan 9, 2021

Copy link
Copy Markdown
Collaborator

⌛ Testing commit 7b36408 with merge 6184f23...

@bors

bors commented Jan 9, 2021

Copy link
Copy Markdown
Collaborator

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

@borsbors added the merged-by-bors This PR was explicitly merged by bors. label Jan 9, 2021
@bors
bors merged commit 6184f23 into rust-lang:masterJan 9, 2021
@rustbotrustbot added this to the 1.51.0 milestone Jan 9, 2021
This was referenced Jan 12, 2021
Closed
Closed
Aaron1011 added a commit to Aaron1011/rust that referenced this pull request Jan 28, 2021
@Aaron1011
Clone entire TokenCursor when collecting tokens
5d73918
Reverts PR rust-lang#80830Fixestaiki-e/pin-project#312
We can have an arbitrary number of `None`-delimited group frames pushed
on the stack due to proc-macro invocations, which can legally be exited.
Attempting to account for this would add a lot of complexity for a tiny
performance gain, so let's just use the original strategy.
@Aaron1011Aaron1011 mentioned this pull request Jan 28, 2021
Merged
Sign up for freeto join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

@petrochenkovpetrochenkov

Labels

merged-by-borsThis PR was explicitly merged by bors.S-waiting-on-borsStatus: Waiting on bors to run and complete tests. Bors will change the label on completion.

Projects

None yet

Milestone

1.51.0

Development

Successfully merging this pull request may close these issues.

7 participants

@Aaron1011@rust-highfive@rust-timer@bors@petrochenkov@ecstatic-morse@rustbot