Glued tokens can themselves be joint.#47343

goffrie · 2018-01-11T01:23:57Z

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 · 2018-01-11T21:00:20Z

Thanks! @bors r+

bors · 2018-01-11T21:00:20Z

📌 Commit 2e0ad5a has been approved by jseyfried

@jseyfried

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

Rollup of 24 pull requests - Successful merges: #46985, #47069, #47081, #47185, #47282, #47283, #47288, #47289, #47298, #47305, #47306, #47307, #47310, #47324, #47328, #47331, #47340, #47343, #47344, #47352, #47357, #47365, #47375, #47382 - Failed merges: #47334

bors · 2018-01-12T23:32:05Z

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

rust-highfive assigned jseyfried Jan 11, 2018

kennytm mentioned this pull request Jan 12, 2018

Rollup of 24 pull requests #47392

Merged

bors merged commit 2e0ad5a into rust-lang:master Jan 12, 2018

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Uh oh!

Glued tokens can themselves be joint.#47343