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

Fix issue eating colon in bound-less where clause entries #4773

Open
wants to merge 2 commits into
base: rustfmt-2.0.0-rc.2
Choose a base branch
from

Conversation

whizsid
Copy link
Contributor

@whizsid whizsid commented Mar 27, 2021

Fixes #4637 .

@calebcartwright calebcartwright changed the base branch from master to rustfmt-2.0.0-rc.2 April 30, 2021 00:29
@ytmimi ytmimi added p-low pr-targeting-2.0 This PR is targeting the 2.0 branch labels Jul 27, 2022
@steffahn
Copy link
Member

steffahn commented Jul 31, 2022

@calebcartwright

(NB: I don’t fully understand the full status of the 2.0 branch, even after searching for it, because there doesn’t seem any good documentation of what it’s about.)

I know it’s been 15 months, so perhaps you don’t remember any reasons anyway: I don’t understand why this PR was moved to target 2.0, even though it’s a bugfix. Does moving this to 2.0 mean that rustfmt is supposed to produce invalid code and this shouldn’t change? Or was there some technical reason / something wrong with this PR?

@calebcartwright
Copy link
Member

@steffahn - For reasons detailed in #4801, we changed the default branch of this repository. That in turn entailed updating the target branch of certain PRs that were open at that time to make sure they were targeting the same branch they were originally sourced from.

(NB: I don’t fully understand the full status of the 2.0 branch, even after searching for it, because there doesn’t seem any good documentation of what it’s about.)

It's discussed in a few issues, but a semi-tl;dr:

Some time back, the rustfmt team (prior to my joining) internally made a decision to start working towards a breaking/major 2.0 version of rustfmt and that involved utilizing different branches to develop/maintain increasingly divergent versions of rustfmt (the experimental breaking 2.0 version, and the one, official version that continued to be released to end users). However, the notion of having a breaking/major release of an official tool, independent of the rest of the official ecosystem, was quickly shot down by the dev tools team as well as individuals from the core team. Accordingly, the 2.0 version of rustfmt never became anything more than an experiment in this repo.

There's a sizeable bucket of work to get changes that were already committed to that experimental branch back into the actual mainline for rustfmt, as well as changes that were proposed against that experimental branch but not merged, such as this one.

@steffahn
Copy link
Member

I see. Thank you for the explanation :-)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
p-low pr-not-reviewed pr-targeting-2.0 This PR is targeting the 2.0 branch
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Rustfmt eating the colon in bound-less where clause entries (for lifetimes).
4 participants