Skip to content

More static symbols #74175

New issue

Have a question about this project? # for a free GitHub account to open an issue and contact its maintainers and the community.

#

By clicking “#”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? # to your account

Jump to bottom
Merged
merged 4 commits into from
Jul 15, 2020
Merged

More static symbols #74175

merged 4 commits into from
Jul 15, 2020

Conversation

nnethercote
Copy link
Contributor

These commits add some more static symbols and convert lots of places to use them.

r? @oli-obk

@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

Eh, I have to rebase.

@nnethercote nnethercote force-pushed the more-static-symbols branch from 4c57c50 to 28a2f1d Compare July 9, 2020 09:37
@nnethercote
Copy link
Contributor Author

Thanks for the quick feedback! I have rebased and addressed the comments.

@oli-obk
Copy link
Contributor

oli-obk commented Jul 9, 2020

r=me with the as_str removed

@nnethercote
Copy link
Contributor Author

r=me with the as_str removed

What do you think about my explanation?

@nnethercote nnethercote force-pushed the more-static-symbols branch 2 times, most recently from ed89e7c to 7e492d4 Compare July 9, 2020 12:27
@nnethercote
Copy link
Contributor Author

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Jul 9, 2020

📌 Commit 7e492d4efc878f20ac18deaeed5806fe8895cfb8 has been approved by oli-obk

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 9, 2020
@nnethercote
Copy link
Contributor Author

@bors p=1

Because this is conflict-prone.

@Mark-Simulacrum
Copy link
Member

Is this potentially affecting perf? Should we avoid rolling it up?

@oli-obk
Copy link
Contributor

oli-obk commented Jul 9, 2020

@bors rollup=never

while I consider it unlikely to affect perf, the potential is there.

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

I did some local measurements of check runs (which should be representative) and the perf effects were negligible. But the changes would be much too big for a rollup anyway, I would have thought?

@oli-obk
Copy link
Contributor

oli-obk commented Jul 10, 2020

I did some local measurements of check runs (which should be representative) and the perf effects were negligible. But the changes would be much too big for a rollup anyway, I would have thought?

There's a small (but important) difference between marking a PR for rollups and including a PR in rollups.

The latter happens frequently and for all PRs except for perf-related PRs.

@nnethercote
Copy link
Contributor Author

I heard recently that changes above a particular size were not considered for rollups. Is that incorrect?

@oli-obk
Copy link
Contributor

oli-obk commented Jul 10, 2020

Hmm... I honestly don't know our rollup policy that well. But 🤷 it's rollup=never now anyway, so gonna be fine.

@Manishearth
Copy link
Member

@bors rollup=never

@Manishearth
Copy link
Member

@bors p=0

rollup=never now autoprioritizes

@Manishearth
Copy link
Member

@bors retry

  • network

@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-review Status: Awaiting review from the assignee but also interested parties. labels Jul 14, 2020
@bors
Copy link
Collaborator

bors commented Jul 14, 2020

☔ The latest upstream changes (presumably #74330) 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 14, 2020
@Manishearth
Copy link
Member

Sorry about that, once you patch this up I'll try to get this landed.

@bors p=1

@nnethercote
Rename sym::nontrapping_fptoint.
026089b
@nnethercote
Fix the ordering of the static symbols.
e284f5d
@nnethercote
Add and use more static symbols.
f04e866 
Note that the output of `unpretty-debug.stdout` has changed. In that
test the hash values are normalized from a symbol numbers to small
numbers like "0#0" and "0#1". The increase in the number of static
symbols must have caused the original numbers to contain more digits,
resulting in different pretty-printing prior to normalization.
@nnethercote
Remove lots of Symbol::as_str() calls.
5930081 
In various ways, such as changing functions to take a `Symbol` instead
of a `&str`.
@nnethercote nnethercote force-pushed the more-static-symbols branch from 06c4d0b to 5930081 Compare July 14, 2020 23:01
@nnethercote
Copy link
Contributor Author

@bors r=oli-obk

@bors
Copy link
Collaborator

bors commented Jul 14, 2020

📌 Commit 5930081 has been approved by oli-obk

@bors
Copy link
Collaborator

bors commented Jul 14, 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 14, 2020
@bors
Copy link
Collaborator

bors commented Jul 15, 2020

⌛ Testing commit 5930081 with merge 567ad74...

@bors bors mentioned this pull request Jul 15, 2020
Merged
@bors
Copy link
Collaborator

bors commented Jul 15, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: oli-obk
Pushing 567ad74 to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jul 15, 2020
@bors bors merged commit 567ad74 into rust-lang:master Jul 15, 2020
This was referenced Jul 15, 2020
Merged
Merged
Merged
Closed
Merged
Merged
@nnethercote nnethercote deleted the more-static-symbols branch July 15, 2020 04:20
@cuviper cuviper added this to the 1.47.0 milestone May 2, 2024
# for free to join this conversation on GitHub. Already have an account? # to comment
Reviewers

@oli-obk oli-obk oli-obk left review comments

@petrochenkov petrochenkov petrochenkov left review comments

Assignees

@oli-obk oli-obk

Labels
merged-by-bors This PR was explicitly merged by bors. 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.
8 participants
@nnethercote @oli-obk @bors @Mark-Simulacrum @Manishearth @petrochenkov @cuviper @rust-highfive