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

Only compute the trait map once #85905

Merged
merged 5 commits into from
Jun 2, 2021
Merged

Only compute the trait map once #85905

merged 5 commits into from
Jun 2, 2021

Conversation

cjgillot
Copy link
Contributor

@cjgillot cjgillot commented Jun 1, 2021

Part of #85153

r? @Aaron1011

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Jun 1, 2021
@cjgillot
Copy link
Contributor Author

cjgillot commented Jun 1, 2021

Let's be prudent this time.
@bors try @rust-timer queue

@rust-timer
Copy link
Collaborator

Awaiting bors try build completion.

@rustbot label: +S-waiting-on-perf

@rustbot rustbot added the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 1, 2021
@bors
Copy link
Contributor

bors commented Jun 1, 2021

⌛ Trying commit 0839cd5 with merge 4cc9d73408655d50818d9fe59d3e9534a9504db5...

Aaron1011
Aaron1011 reviewed Jun 1, 2021
View reviewed changes
compiler/rustc_resolve/src/lib.rs Outdated
debug_assert!(!self.took_trait_map);
self.took_trait_map = true;
}
std::mem::take(&mut self.trait_map)
Copy link
Member

@Aaron1011 Aaron1011 Jun 1, 2021 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

On further thought - how much work would it be to make this an Option, and remove took_trait_map?

@bors
Copy link
Contributor

bors commented Jun 1, 2021

☀️ Try build successful - checks-actions
Build commit: 4cc9d73408655d50818d9fe59d3e9534a9504db5 (4cc9d73408655d50818d9fe59d3e9534a9504db5)

@rust-timer
Copy link
Collaborator

Queued 4cc9d73408655d50818d9fe59d3e9534a9504db5 with parent 7f9ab03, future comparison URL.

@rust-log-analyzer

This comment has been minimized.

Sign in to view
@rust-timer
Copy link
Collaborator

Finished benchmarking try commit (4cc9d73408655d50818d9fe59d3e9534a9504db5): comparison url.

Benchmarking this pull request likely means that it is perf-sensitive, so we're automatically marking it as not fit for rolling up. Please note that if the perf results are neutral, you should likely undo the rollup=never given below by specifying rollup- to bors.

Importantly, though, if the results of this run are non-neutral do not roll this PR up -- it will mask other regressions or improvements in the roll up.

@bors rollup=never
@rustbot label: +S-waiting-on-review -S-waiting-on-perf

@rustbot rustbot removed the S-waiting-on-perf Status: Waiting on a perf run to be completed. label Jun 1, 2021
@Aaron1011
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 1, 2021

📌 Commit 93b25bd has been approved by Aaron1011

@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 Jun 1, 2021
@bors
Copy link
Contributor

bors commented Jun 2, 2021

⌛ Testing commit 93b25bd with merge 451fe0c79f0650edf41129cd2a79eab6504269f6...

@bors
Copy link
Contributor

bors commented Jun 2, 2021

💔 Test failed - checks-actions

@rust-log-analyzer
Copy link
Collaborator

A job failed! Check out the build log: (web) (plain)

Click to see the possible cause of the failure (guessed by this bot)

@bors bors added S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. and removed S-waiting-on-bors Status: Waiting on bors to run and complete tests. Bors will change the label on completion. labels Jun 2, 2021
@Aaron1011
Copy link
Member

@bors r+

@bors
Copy link
Contributor

bors commented Jun 2, 2021

💡 This pull request was already approved, no need to approve it again.

  • This pull request previously failed. You should add more commits to fix the bug, or use retry to trigger a build again.
  • There's another pull request that is currently being tested, blocking this pull request: New prelude #85687

@bors
Copy link
Contributor

bors commented Jun 2, 2021

📌 Commit 93b25bd has been approved by Aaron1011

@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 Jun 2, 2021
@bors
Copy link
Contributor

bors commented Jun 2, 2021

⌛ Testing commit 93b25bd with merge d20b9ad...

@bors
Copy link
Contributor

bors commented Jun 2, 2021

☀️ Test successful - checks-actions
Approved by: Aaron1011
Pushing d20b9ad to master...

@bors bors added the merged-by-bors This PR was explicitly merged by bors. label Jun 2, 2021
@bors bors merged commit d20b9ad into rust-lang:master Jun 2, 2021
@rustbot rustbot added this to the 1.54.0 milestone Jun 2, 2021
@cjgillot cjgillot deleted the one-trait-map branch June 2, 2021 11:59
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@Aaron1011 Aaron1011 Aaron1011 left review comments

Assignees

@Aaron1011 Aaron1011

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.54.0
Development

Successfully merging this pull request may close these issues.
7 participants
@cjgillot @rust-timer @bors @rust-log-analyzer @Aaron1011 @rust-highfive @rustbot