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

Glued tokens can themselves be joint. #47343

Merged
merged 1 commit into from
Jan 12, 2018
Merged

Glued tokens can themselves be joint. #47343

merged 1 commit into from
Jan 12, 2018

Conversation

goffrie
Copy link
Contributor

@goffrie goffrie commented Jan 11, 2018

When gluing two tokens, the second of which is joint, the result should also be
joint.
This fixes an issue with joining three Dot tokens to make a DotDotDot - the
intermediate DotDot would not be joint and therefore we would not attempt to
glue the last Dot token, yielding .. . instead of ....

r? @jseyfried

When gluing two tokens, the second of which is joint, the result should also be
joint.
This fixes an issue with joining three `Dot` tokens to make a `DotDotDot` - the
intermediate `DotDot` would not be joint and therefore we would not attempt to
glue the last `Dot` token, yielding `.. .` instead of `...`.
@jseyfried
Copy link
Contributor

Thanks! @bors r+

@bors
Copy link
Contributor

bors commented Jan 11, 2018

📌 Commit 2e0ad5a has been approved by jseyfried

kennytm added a commit to kennytm/rust that referenced this pull request Jan 12, 2018
Glued tokens can themselves be joint.

When gluing two tokens, the second of which is joint, the result should also be
joint.
This fixes an issue with joining three `Dot` tokens to make a `DotDotDot` - the
intermediate `DotDot` would not be joint and therefore we would not attempt to
glue the last `Dot` token, yielding `.. .` instead of `...`.

r? @jseyfried
bors added a commit that referenced this pull request Jan 12, 2018
@bors bors merged commit 2e0ad5a into rust-lang:master Jan 12, 2018
@bors
Copy link
Contributor

bors commented Jan 12, 2018

☔ The latest upstream changes (presumably #47392) made this pull request unmergeable. Please resolve the merge conflicts.

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.

3 participants