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.

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

Remove arena's dependency on rustc_data_structures #77962

Merged
merged 1 commit into from
Oct 16, 2020

Conversation

bugadani
Copy link
Contributor

rustc_arena currently has a dependency on rustc_data_structures because of a trivial "don't inline me" function. This PR copies that function and removes the dependency.

@rust-highfive
Copy link
Collaborator

r? @eddyb

(rust_highfive has picked a reviewer for you, use r? to override)

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Oct 15, 2020
@jyn514
Copy link
Member

jyn514 commented Oct 15, 2020

Maybe cold_path should be in std::hint?

@Mark-Simulacrum
Copy link
Member

I am somewhat surprised to see it like this rather than an unlikely branch or whatever, but seems fine to do this.

@bors r+ rollup=never in case of perf effects

@bors
Copy link
Contributor

bors commented Oct 15, 2020

📌 Commit 52ff31a has been approved by Mark-Simulacrum

@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 Oct 15, 2020
@bugadani
Copy link
Contributor Author

This can have perf effects? 👀

@jyn514 jyn514 added C-cleanup Category: PRs that clean code up or issues documenting cleanup. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue. labels Oct 15, 2020
@bors
Copy link
Contributor

bors commented Oct 16, 2020

⌛ Testing commit 52ff31a with merge 8e6f69a...

@bors
Copy link
Contributor

bors commented Oct 16, 2020

☀️ Test successful - checks-actions, checks-azure
Approved by: Mark-Simulacrum
Pushing 8e6f69a to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Oct 16, 2020
@bors bors merged commit 8e6f69a into rust-lang:master Oct 16, 2020
@rustbot rustbot added this to the 1.49.0 milestone Oct 16, 2020
@rust-highfive
Copy link
Collaborator

📣 Toolstate changed by #77962!

Tested on commit 8e6f69a.
Direct link to PR: #77962

🎉 rls on windows: test-fail → test-pass (cc @Xanewok).

rust-highfive added a commit to rust-lang-nursery/rust-toolstate that referenced this pull request Oct 16, 2020
Tested on commit rust-lang/rust@8e6f69a.
Direct link to PR: <rust-lang/rust#77962>

🎉 rls on windows: test-fail → test-pass (cc @Xanewok).
@bugadani bugadani deleted the arena2 branch October 16, 2020 06:59
@bugadani
Copy link
Contributor Author

Umm, I'm quite sure this PR didn't fix rls? :)

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
C-cleanup Category: PRs that clean code up or issues documenting cleanup. 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. T-compiler Relevant to the compiler team, which will review and decide on the PR/issue.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

7 participants