-
Notifications
You must be signed in to change notification settings - Fork 12.8k
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
Tidy: ensure lang features are sorted by since #60373
Conversation
f6e7d31
to
a4ff1d9
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks pretty good in general; some nits... :)
If you look at the rust/src/libsyntax/feature_gate.rs Lines 119 to 121 in 96ee0ba
which is then followed by: rust/src/libsyntax/feature_gate.rs Lines 254 to 256 in 834bd19
and: rust/src/libsyntax/feature_gate.rs Lines 277 to 279 in 834bd19
For the time being, you should be able to use these 3 groups to test the new tidy logic out, for example: // -------------------------------------------------------------------------
// feature-group-start: internal feature gates
// -------------------------------------------------------------------------
$the_features
// -------------------------------------------------------------------------
// feature-group-end: internal feature gates
// ------------------------------------------------------------------------- |
c80c5b3
to
b2a8617
Compare
Rebased on master, grouped and sorted feature gates. Ready for review! |
c1b18b7
to
7646763
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This looks great! Let's wait for travis to go green and let's merge :)
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Sorry; should have noticed this before... Right now you are not using next_feature_group
as anything but a bool
so Some(group.to_owned())
is not useful here. Let's just switch to a bool
.
No problem. Fixed! |
Great work; Thanks! @bors r+ |
📌 Commit 258b40e4345708e16af1953113bcde9480d3d91a has been approved by |
🔒 Merge conflict This pull request and the master branch diverged in a way that cannot be automatically merged. Please rebase on top of the latest master branch, and let the reviewer approve again. How do I rebase?Assuming
You may also read Git Rebasing to Resolve Conflicts by Drew Blessing for a short tutorial. Please avoid the "Resolve conflicts" button on GitHub. It uses Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Error message
|
`find_attr_val(&line, "since")` returns `Some(", issue = ")` when `line` is set to the following line: ``` [unstable(feature = "checked_duration_since", issue = "58402")] ``` Make `find_attr_val` use regex that is a little bit more precise (requires `=` after key name). It still does not handle all cases (e.g., extra leading chars in key name, or escaped quotes in value), but is good enough for now.
258b40e
to
201f14b
Compare
Rebased on top of the master to fix the conflict. |
@bors r+ |
📌 Commit 201f14b has been approved by |
… r=Centril Tidy: ensure lang features are sorted by since This is the tidy side of rust-lang#60361. What is left is actually splitting features into groups and sorting by since. This PR also likely to produce a small (a couple of lines) merge conflict with rust-lang#60362. r? @Centril
… r=Centril Tidy: ensure lang features are sorted by since This is the tidy side of rust-lang#60361. What is left is actually splitting features into groups and sorting by since. This PR also likely to produce a small (a couple of lines) merge conflict with rust-lang#60362. r? @Centril
… r=Centril Tidy: ensure lang features are sorted by since This is the tidy side of rust-lang#60361. What is left is actually splitting features into groups and sorting by since. This PR also likely to produce a small (a couple of lines) merge conflict with rust-lang#60362. r? @Centril
Rollup of 12 pull requests Successful merges: - #59928 (Make deprecation lint `ambiguous_associated_items` deny-by-default) - #60220 (report fatal errors during doctest parsing) - #60373 (Tidy: ensure lang features are sorted by since) - #60388 (Disallow non-explicit elided lifetimes in async fn) - #60393 ( Do not suggest incorrect syntax on pattern type error due to borrow) - #60401 (Rename `RUST_LOG` to `RUSTC_LOG`) - #60409 (Require a trait in the bounds of existential types) - #60455 (Resolve match arm ty when arms diverge) - #60457 (Const prop refactoring) - #60467 (Avoid repeated interning of static strings.) - #60478 (minor compiler doc tweaks) - #60501 (Propagate mutability from arguments to local bindings in async fn) Failed merges: r? @ghost
This is the tidy side of #60361.
What is left is actually splitting features into groups and sorting by since.
This PR also likely to produce a small (a couple of lines) merge conflict with #60362.
r? @Centril