Skip to content

Rustup #6007

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

Merged
merged 7 commits into from
Sep 4, 2020
Merged

Rustup #6007

merged 7 commits into from
Sep 4, 2020

Conversation

ebroto
Copy link
Member

@ebroto ebroto commented Sep 4, 2020

r? @ghost

changelog: none

scrabsha and others added 7 commits September 2, 2020 13:18
If a comma in a format call is replaced with a similar token, then we
emit an error and continue parsing, instead of stopping at this point.
Improve recovery on malformed format call

The token following a format expression should be a comma. However, when it is replaced with a similar token (such as a dot), then the corresponding error is emitted, but the token is treated as a comma, and the parsing step continues.

r? @petrochenkov
@ebroto
Copy link
Member Author

ebroto commented Sep 4, 2020

@bors r+ p=9001

@bors
Copy link
Contributor

bors commented Sep 4, 2020

📌 Commit 2905fff has been approved by ebroto

@bors
Copy link
Contributor

bors commented Sep 4, 2020

⌛ Testing commit 2905fff with merge acb30b5...

bors added a commit that referenced this pull request Sep 4, 2020
@ebroto
Copy link
Member Author

ebroto commented Sep 4, 2020

@bors retry (network error)

@bors
Copy link
Contributor

bors commented Sep 4, 2020

⌛ Testing commit 2905fff with merge f253dd0...

@bors
Copy link
Contributor

bors commented Sep 4, 2020

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

@bors bors merged commit f253dd0 into rust-lang:master Sep 4, 2020
@ebroto ebroto deleted the sync-from-rust branch September 4, 2020 22:40
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