Skip to content

Conversation

Aaron1011
Copy link
Contributor

The previous implementation did not work when called on an opening
delimiter, or when called re-entrantly from the same TokenCursor stack
depth.

I'm not sure how to test this apart from #72287

@rust-highfive
Copy link
Contributor

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label May 20, 2020
@petrochenkov
Copy link
Contributor

r? @petrochenkov

@rust-highfive rust-highfive assigned petrochenkov and unassigned eddyb May 20, 2020
@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 21, 2020
@Aaron1011 Aaron1011 force-pushed the feature/rewrite-collect-tokens branch from ab6f593 to 1b9da36 Compare May 21, 2020 20:37
@Aaron1011
Copy link
Contributor Author

@petrochenkov: Updated

@Aaron1011 Aaron1011 added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 21, 2020
@petrochenkov
Copy link
Contributor

r=me after squashing commits

@petrochenkov petrochenkov added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 22, 2020
The previous implementation did not work when called on an opening
delimiter, or when called re-entrantly from the same `TokenCursor` stack
depth.
@Aaron1011 Aaron1011 force-pushed the feature/rewrite-collect-tokens branch from f768cd3 to 52bb09a Compare May 22, 2020 07:27
@Aaron1011
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Collaborator

bors commented May 22, 2020

📌 Commit 52bb09a 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-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 22, 2020
@bors
Copy link
Collaborator

bors commented May 22, 2020

⌛ Testing commit 52bb09a with merge c4cb65167c4a3f89c7dfd427186203b675185633...

@bors
Copy link
Collaborator

bors commented May 22, 2020

💔 Test failed - checks-azure

@Aaron1011
Copy link
Contributor Author

@bors retry

RalfJung added a commit to RalfJung/rust that referenced this pull request May 23, 2020
…okens, r=petrochenkov

Rewrite `Parser::collect_tokens`

The previous implementation did not work when called on an opening
delimiter, or when called re-entrantly from the same `TokenCursor` stack
depth.

I'm not sure how to test this apart from rust-lang#72287
bors added a commit to rust-lang-ci/rust that referenced this pull request May 24, 2020
Rollup of 3 pull requests

Successful merges:

 - rust-lang#72284 (Remove `macro_defs` map)
 - rust-lang#72393 (Rewrite `Parser::collect_tokens`)
 - rust-lang#72528 (Fix typo in doc comment.)

Failed merges:

r? @ghost
@bors bors merged commit 8692c45 into rust-lang:master May 24, 2020
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants