Tidy: ensure lang features are sorted by since by rasendubi · Pull Request #60373 · rust-lang/rust

rasendubi · 2019-04-29T18:00:30Z

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

Centril

Looks pretty good in general; some nits... :)

Centril · 2019-05-01T06:24:11Z

What is left is actually splitting features into groups and sorting by since.

If you look at the feature_gate.rs file now you will see:

rust/src/libsyntax/feature_gate.rs

Lines 119 to 121 in 96ee0ba

// -------------------------------------------------------------------------
// Internal feature gates.
// -------------------------------------------------------------------------

which is then followed by:

rust/src/libsyntax/feature_gate.rs

Lines 254 to 256 in 834bd19

// -------------------------------------------------------------------------
// Actual feature gates (target features).
// -------------------------------------------------------------------------

and:

rust/src/libsyntax/feature_gate.rs

Lines 277 to 279 in 834bd19

// -------------------------------------------------------------------------
// Actual feature gates.
// -------------------------------------------------------------------------

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// -------------------------------------------------------------------------

rasendubi · 2019-05-01T19:44:39Z

Rebased on master, grouped and sorted feature gates. Ready for review!

Centril

This looks great! Let's wait for travis to go green and let's merge :)

Centril

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.

rasendubi · 2019-05-02T11:31:51Z

Sorry; should have noticed this before...

No problem. Fixed!

Centril · 2019-05-02T11:39:53Z

Great work; Thanks!

@bors r+

bors · 2019-05-02T11:39:55Z

📌 Commit 258b40e4345708e16af1953113bcde9480d3d91a has been approved by Centril

bors · 2019-05-02T13:26:47Z

🔒 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 self is your fork and upstream is this repository, you can resolve the conflict following these steps:

git checkout lang-features-sort-since(switch to your branch)
git fetch upstream master(retrieve the latest master)
git rebase upstream/master -p(rebase on top of it)
Follow the on-screen instruction to resolve conflicts (check git status if you got lost).
git push self lang-features-sort-since --force-with-lease(update this PR)

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 git merge instead of git rebase which makes the PR commit history more difficult to read.

Sometimes step 4 will complete without asking for resolution. This is usually due to difference between how Cargo.lock conflict is handled during merge and rebase. This is normal, and you should still perform step 5 to update this PR.

Error message

warning: Cannot merge binary files: Cargo.lock (HEAD vs. heads/homu-tmp)
Auto-merging Cargo.lock
CONFLICT (content): Merge conflict in Cargo.lock
Automatic merge failed; fix conflicts and then commit the result.

`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.

rasendubi · 2019-05-02T13:40:23Z

Rebased on top of the master to fix the conflict.

Centril · 2019-05-02T13:43:44Z

@bors r+

bors · 2019-05-02T13:43:45Z

📌 Commit 201f14b has been approved by Centril

@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

@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

@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

@ghost

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

@oli-obk

Enforce sorting of accepted and removed features Fixes#60361 with mechanism introduced in #60373. r? @oli-obk

rust-highfive assigned Centril Apr 29, 2019

rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Apr 29, 2019

rasendubi force-pushed the lang-features-sort-since branch from f6e7d31 to a4ff1d9Compare April 29, 2019 18:02

Centril reviewed May 1, 2019
View reviewed changes

rasendubi force-pushed the lang-features-sort-since branch from c80c5b3 to b2a8617Compare May 1, 2019 19:43

Centril reviewed May 1, 2019
View reviewed changes

Comment threadsrc/tools/tidy/src/features.rs Outdated
Comment threadsrc/tools/tidy/src/features/version.rs Outdated

rasendubi force-pushed the lang-features-sort-since branch from c1b18b7 to 7646763Compare May 1, 2019 21:54

Centril approved these changes May 1, 2019
View reviewed changes

fbstj reviewed May 2, 2019
View reviewed changes

Comment threadsrc/tools/tidy/src/features.rs Outdated

Centril suggested changes May 2, 2019
View reviewed changes

Centril approved these changes May 2, 2019
View reviewed changes

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. labels May 2, 2019

bors added S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels May 2, 2019

rasendubi added 9 commits May 2, 2019 16:38

Assign group and parse since for Feature
b7f55ca

Ensure language features in group are sorted by since
d5ba6d4

Address review comments
d54477e

Make tidy::version::Version a [u32; 3]
90d3fa2

Group and sort feature_gate.rs
3b4fe7e

Rework Version::parse to avoid extra allocations
c120fd8

Make in_feature_group a simple bool flag
4bcc828

Make tidy::version::Version copy
201f14b

rasendubi force-pushed the lang-features-sort-since branch from 258b40e to 201f14bCompare May 2, 2019 13:39

bors added S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. and removed S-waiting-on-author Status: This is awaiting some action (such as code changes or more information) from the author. labels May 2, 2019

kennytm mentioned this pull request May 2, 2019
Rollup of 7 pull requests #60472
Closed

Centril mentioned this pull request May 2, 2019
Rollup of 11 pull requests #60488
Closed

Centril mentioned this pull request May 3, 2019
Rollup of 12 pull requests #60510
Merged

bors merged commit 201f14b into rust-lang:masterMay 3, 2019

Centril mentioned this pull request May 4, 2019
Enforce sorting of accepted and removed features #60531
Merged

bors added a commit that referenced this pull request May 7, 2019
Auto merge of#60531- Centril:sort-features, r=oli-obk
eeedd3a
Enforce sorting of accepted and removed features Fixes#60361 with mechanism introduced in #60373. r? @oli-obk

Uh oh!

Uh oh!

Conversation

rasendubi commented Apr 29, 2019

Uh oh!

Centril left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Centril commented May 1, 2019• edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Uh oh!

rasendubi commented May 1, 2019

Uh oh!

Uh oh!

Uh oh!

Centril left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Centril left a comment

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

Uh oh!

rasendubi commented May 2, 2019

Uh oh!

Centril commented May 2, 2019

Uh oh!

bors commented May 2, 2019

Uh oh!

bors commented May 2, 2019

Uh oh!

rasendubi commented May 2, 2019

Uh oh!

Centril commented May 2, 2019

Uh oh!

bors commented May 2, 2019

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

5 participants

Centril commented May 1, 2019•
edited
Loading