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.

Sign up for GitHub

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

Jump to bottom

Filter out block comment in filter_normal_code if configured to use rustfmt 2 (#4668) #4758

Open
wants to merge 2 commits into
base: rustfmt-1.4.37
Choose a base branch
from
Open

Filter out block comment in filter_normal_code if configured to use rustfmt 2 (#4668) #4758

wants to merge 2 commits into from

Conversation

ChinYing-Li
Copy link
Contributor

Back-port the fix (#4720) to rustfmt 1.x;
In order to version-gate in LineClasses, several function signature had been changed:

  • wrap_str
  • filter_normal_code

Should we add the idempotent test cases as well?

@calebcartwright
Copy link
Member

itemize_list

Yes please!

@ChinYing-Li
Copy link
Contributor Author

I didn't see version gating in other idempotent tests, so I am thinking about creating a standalone set of test cases that use a Config file whose version is Version:Two. Please let me know if you recommend doing this the other way.

@calebcartwright
Copy link
Member

I didn't see version gating in other idempotent tests, so I am thinking about creating a standalone set of test cases that use a Config file whose version is Version:Two

There's actually a much simpler to specify configuration values in the files used for the system idempotence tests, just add comments to the top of the files as needed of the form // rustfmt-{option name}: {value}

e.g.

rustfmt/tests/source/issue-3302.rs

Line 1 in c3a5111

// rustfmt-version: Two

More info can be found in this section of the Contributing guide.

@calebcartwright
Copy link
Member

Thank you! This looks good to go, though I haven't decided whether I want to pull it into the 1.4.37 release just yet so may hold off on merging for a little while.

There are plenty of other cases where we need to do a similar backporting, as well as general issues/feature requests on the backlog, so if you're interested in working on anything else please let me know and/or drop a note on the corresponding issue!

@calebcartwright calebcartwright added this to the 1.4.38 milestone Apr 21, 2021
@calebcartwright calebcartwright mentioned this pull request Apr 24, 2021
Open
@calebcartwright calebcartwright force-pushed the rustfmt-1.4.37 branch 2 times, most recently from e0e294d to 5292bc5 Compare October 19, 2021 01:32
@karyon
Copy link
Contributor

karyon commented Oct 22, 2021

@ChinYing-Li maybe you could push the branch again to re-trigger the CI so it might become green?

Other than that, since 1.4.37 has been released a while ago... :)

@ytmimi ytmimi added the p-low label Jul 27, 2022
gentoid added a commit to gentoid/rustfmt that referenced this pull request Aug 29, 2023
@gentoid
Copy test files from rust-lang#4758
b3729f6
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees
No one assigned
Labels
p-low pr-follow-up-review-pending pr-waiting-on-author
Projects
None yet
Milestone
1.4.38
Development

Successfully merging this pull request may close these issues.
4 participants
@ChinYing-Li @calebcartwright @karyon @ytmimi