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.

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

Rustup #6325

Merged
merged 3 commits into from
Nov 12, 2020
Merged

Rustup #6325

merged 3 commits into from
Nov 12, 2020

Conversation

flip1995
Copy link
Member

r? @ghost

changelog: none

petrochenkov and others added 3 commits November 9, 2020 01:47
occurences -> occurrences
Do not collect tokens for doc comments

Doc comment is a single token and AST has all the information to re-create it precisely.
Doc comments are also responsible for majority of calls to `collect_tokens` (with `num_calls == 1` and `num_calls == 0`, cc rust-lang/rust#78736).

(I also moved token collection into `fn parse_attribute` to deduplicate code a bit.)

r? `@Aaron1011`
@flip1995
Copy link
Member Author

@bors r+ p=1

@bors
Copy link
Contributor

bors commented Nov 12, 2020

📌 Commit 92ece84 has been approved by flip1995

@bors
Copy link
Contributor

bors commented Nov 12, 2020

⌛ Testing commit 92ece84 with merge bd13a35...

@bors
Copy link
Contributor

bors commented Nov 12, 2020

☀️ Test successful - checks-action_dev_test, checks-action_remark_test, checks-action_test
Approved by: flip1995
Pushing bd13a35 to master...

@bors bors merged commit bd13a35 into rust-lang:master Nov 12, 2020
@flip1995 flip1995 deleted the rustup branch November 12, 2020 08:02
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants