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

Remove version gates #3891

Merged
merged 15 commits into from
Dec 16, 2019
Merged

Remove version gates #3891

merged 15 commits into from
Dec 16, 2019

Conversation

topecongiro
Copy link
Contributor

Close #3886.

scampi
scampi reviewed Oct 27, 2019
View reviewed changes
Copy link
Contributor

@scampi scampi left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the first and last commits are not about gates, are they in this PR on purpose ? It makes the review a bit more difficult.

src/missed_spans.rs Show resolved Hide resolved
src/missed_spans.rs Show resolved Hide resolved
src/utils.rs Outdated Show resolved Hide resolved
src/utils.rs Outdated Show resolved Hide resolved
src/visitor.rs Show resolved Hide resolved
tests/target/trailing_comments/hard_tabs.rs Show resolved Hide resolved
@topecongiro
Copy link
Contributor Author

@scampi Sorry about the PR being large and unorganized and hard to review. I first started by simply removing all the version gates, but it didn't work out. I needed to revert #3833 and implement aligning comments in CommentCodeSlices.

@scampi
Copy link
Contributor

scampi commented Oct 27, 2019

No problem @topecongiro, I thought these commits were included in this PR by mistake, which happened to me more than once ;o)

@topecongiro topecongiro added this to the 2.0.0 milestone Oct 29, 2019
@topecongiro topecongiro changed the title [WIP] Remove version gates Remove version gates Dec 3, 2019
@topecongiro topecongiro merged commit e3bb1c1 into rust-lang:master Dec 16, 2019
@topecongiro topecongiro deleted the fix-str branch December 16, 2019 01:33
@rchaser53 rchaser53 mentioned this pull request Dec 23, 2019
Closed
ayazhafiz added a commit to ayazhafiz/rustfmt that referenced this pull request Aug 6, 2020
@ayazhafiz
Indent return types separated from params by newline
238fcd4 
 rust-lang#3891 removed Version One formatting that did this correctly (https://github.com/rust-lang/rustfmt/pull/3891/files#diff-5db152a52bdaeae9dacd35f43a4a78ddL2342-L2344),
but at seemingly at the time there were no tests to catch the
regression.

This commit fix-forwards the formatting regression, though via a different
implementation because the original implementation would muddle the branch
for visual indentation and this fix, which is probably not preferrable
giving the existing complexity of the rewrite_required_fn method.

Closes rust-lang#4366
ayazhafiz added a commit to ayazhafiz/rustfmt that referenced this pull request Aug 6, 2020
@ayazhafiz
Indent return types separated from params by newline
6e8dde3 
 rust-lang#3891 removed Version One formatting that did this correctly (https://github.com/rust-lang/rustfmt/pull/3891/files#diff-5db152a52bdaeae9dacd35f43a4a78ddL2342-L2344),
but at seemingly at the time there were no tests to catch the
regression.

This commit fix-forwards the formatting regression, though via a different
implementation because the original implementation would muddle the branch
for visual indentation and this fix, which is probably not preferrable
giving the existing complexity of the rewrite_required_fn method.

Closes rust-lang#4366
ayazhafiz added a commit to ayazhafiz/rustfmt that referenced this pull request Aug 6, 2020
@ayazhafiz
Indent return types separated from params by newline
7247e8a 
 rust-lang#3891 removed Version One formatting that did this correctly (https://github.com/rust-lang/rustfmt/pull/3891/files#diff-5db152a52bdaeae9dacd35f43a4a78ddL2342-L2344),
but at seemingly at the time there were no tests to catch the
regression.

This commit fix-forwards the formatting regression, though via a different
implementation because the original implementation would muddle the branch
for visual indentation and this fix, which is probably not preferrable
giving the existing complexity of the rewrite_required_fn method.

Closes rust-lang#4366
@ayazhafiz ayazhafiz mentioned this pull request Aug 6, 2020
Merged
calebcartwright pushed a commit that referenced this pull request Aug 7, 2020
@ayazhafiz
Indent return types separated from params by newline (#4368)
f817383 
* Indent return types separated from params by newline

 #3891 removed Version One formatting that did this correctly (https://github.com/rust-lang/rustfmt/pull/3891/files#diff-5db152a52bdaeae9dacd35f43a4a78ddL2342-L2344),
but at seemingly at the time there were no tests to catch the
regression.

This commit fix-forwards the formatting regression, though via a different
implementation because the original implementation would muddle the branch
for visual indentation and this fix, which is probably not preferrable
giving the existing complexity of the rewrite_required_fn method.

Closes #4366

* fixup! Indent return types separated from params by newline
@ayazhafiz ayazhafiz mentioned this pull request Aug 8, 2020
Open
@karyon
Copy link
Contributor

karyon commented Oct 26, 2021

backport not needed

@karyon karyon mentioned this pull request Oct 28, 2021
Merged
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@scampi scampi scampi left review comments

Assignees
No one assigned
Labels
1x-backport:n/a
Projects
None yet
Milestone
2.0.0
Development

Successfully merging this pull request may close these issues.

Remove version gates from rustfmt codebase
4 participants
@topecongiro @scampi @karyon @calebcartwright