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

Enforce the static symbol order. #74203

Merged
merged 2 commits into from
Jul 16, 2020
Merged

Enforce the static symbol order. #74203

merged 2 commits into from
Jul 16, 2020

Conversation

nnethercote
Copy link
Contributor

By making the proc macro abort if any symbols are out of order.

The commit also changes the proc macro collect multiple errors (of order
or duplicated symbols) and prints them at the end, which is useful if
you have multiple errors.

r? @petrochenkov

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jul 9, 2020
@nnethercote
Copy link
Contributor Author

@bors rollup=always

@nnethercote nnethercote mentioned this pull request Jul 10, 2020
Merged
@nnethercote
Copy link
Contributor Author

This will need rebasing after #74175 lands, but the code is reviewable in its current state.

@petrochenkov
Copy link
Contributor

@bors r+

@petrochenkov petrochenkov 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 Jul 10, 2020
@nnethercote
Copy link
Contributor Author

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Jul 11, 2020

📌 Commit 714b6ec has been approved by petrochenkov

Manishearth added a commit to Manishearth/rust that referenced this pull request Jul 11, 2020
@Manishearth
Rollup merge of rust-lang#74203 - nnethercote:enforce-static-symbol-o…
f5ee28f 
…rder, r=petrochenkov

Enforce the static symbol order.

By making the proc macro abort if any symbols are out of order.

The commit also changes the proc macro collect multiple errors (of order
or duplicated symbols) and prints them at the end, which is useful if
you have multiple errors.

r? @petrochenkov
@Manishearth Manishearth mentioned this pull request Jul 11, 2020
Closed
@Manishearth
Copy link
Member

@bors r-

#74242 (comment)

@bors 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 Jul 11, 2020
@Manishearth Manishearth mentioned this pull request Jul 11, 2020
Merged
@Manishearth
Copy link
Member

If #72920 lands first this will need to be updated

@bors
Copy link
Contributor

bors commented Jul 15, 2020

☔ The latest upstream changes (presumably #74175) made this pull request unmergeable. Please resolve the merge conflicts.

@nnethercote
Copy link
Contributor Author

I rebased.

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Jul 15, 2020

📌 Commit b82df9188868efef5366699826dbeb3585f0e098 has been approved by petrochenkov

@bors 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 Jul 15, 2020
@bors
Copy link
Contributor

bors commented Jul 15, 2020

☔ The latest upstream changes (presumably #74214) made this pull request unmergeable. Please resolve the merge conflicts.

@bors 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 Jul 15, 2020
@nnethercote
Copy link
Contributor Author

I rebased again.

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Jul 16, 2020

📌 Commit 264797aeabe927a56d28466f3f1939aa50765274 has been approved by petrochenkov

@bors
Copy link
Contributor

bors commented Jul 16, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@bors 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 Jul 16, 2020
@bors
Copy link
Contributor

bors commented Jul 16, 2020

☔ The latest upstream changes (presumably #74375) made this pull request unmergeable. Please resolve the merge conflicts.

@bors 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 Jul 16, 2020
@nnethercote
Enforce the static symbol order.
fd8f177 
By making the proc macro abort if any symbols are out of order.

The commit also changes the proc macro collect multiple errors (of order
or duplicated symbols) and prints them at the end, which is useful if
you have multiple errors.
@nnethercote
Rename sym::item_context as sym::ItemContext.
600b824 
Because it represents the symbol `ItemContext`, and `sym` identifiers
are supposed to match the actual symbol whenever possible.
@nnethercote
Copy link
Contributor Author

I rebased yet again. This commit is super conflict-prone.

@bors r=petrochenkov

@bors
Copy link
Contributor

bors commented Jul 16, 2020

📌 Commit 600b824 has been approved by petrochenkov

@bors
Copy link
Contributor

bors commented Jul 16, 2020

🌲 The tree is currently closed for pull requests below priority 5, this pull request will be tested once the tree is reopened

@bors 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 Jul 16, 2020
@nnethercote nnethercote mentioned this pull request Jul 16, 2020
Closed
@petrochenkov
Copy link
Contributor

@bors p=1

@nnethercote
Copy link
Contributor Author

How do p=1 and rollup=always interact?

@Manishearth Manishearth mentioned this pull request Jul 16, 2020
Merged
bors added a commit to rust-lang-ci/rust that referenced this pull request Jul 16, 2020
@bors
Auto merge of rust-lang#74388 - Manishearth:rollup-i7iueu8, r=Manishe…
4cd0ee9 
…arth

Rollup of 7 pull requests

Successful merges:

 - rust-lang#73421 (Clarify effect of orphan rule changes on From/Into)
 - rust-lang#74037 (Update reference to CONTRIBUTING.md)
 - rust-lang#74203 (Enforce the static symbol order.)
 - rust-lang#74295 (Add and fix BTreeMap comments)
 - rust-lang#74352 (Use local links in the alloc docs.)
 - rust-lang#74377 (Move libstd's default feature to libtest)
 - rust-lang#74381 (Update docs for str::as_bytes_mut.)

Failed merges:

r? @ghost
@Manishearth
Copy link
Member

@nnethercote sort order is by priority first, then rollupability. It's fine to p=1 rollup=always, it means that the PR is high priority but you also have a strong expectation that it will not break anything and encourage rollup authors to pick it up. Typically that never happens because if a PR is high priority it probably makes nontrivial changes that warrant it being high priority, however priority can also be for "this PR is going to bitrot easily", in which case p=1 rollup=always makes sense

@bors
Copy link
Contributor

bors commented Jul 16, 2020

⌛ Testing commit 600b824 with merge 4cd0ee9...

@bors bors merged commit 5b10e47 into rust-lang:master Jul 16, 2020
@nnethercote
Copy link
Contributor Author

Ok, sounds like rollup=always really means rollup=highly-recommended :)

@nnethercote nnethercote deleted the enforce-static-symbol-order branch July 16, 2020 21:25
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@petrochenkov petrochenkov

Labels
S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion.
Projects
None yet
Milestone
1.47.0
Development

Successfully merging this pull request may close these issues.
6 participants
@nnethercote @petrochenkov @bors @Manishearth @cuviper @rust-highfive