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

Move diagnostics out from QueryJob and optimize for the case with no diagnostics #57113

Merged
merged 1 commit into from
Jan 14, 2019
Merged

Move diagnostics out from QueryJob and optimize for the case with no diagnostics #57113

merged 1 commit into from
Jan 14, 2019

Conversation

Zoxc
Copy link
Contributor

@Zoxc Zoxc commented Dec 25, 2018

@rust-highfive rust-highfive added the S-waiting-on-review Status: Awaiting review from the assignee but also interested parties. label Dec 25, 2018
@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 25, 2018

@bors try

@bors
Copy link
Contributor

bors commented Dec 25, 2018

⌛ Trying commit a872c4f1ca4490a342beb6a569dffcac1aea57a4 with merge 203d99c0ed5ec7c17b4cab82a3995a30de4903ce...

@bors
Copy link
Contributor

bors commented Dec 25, 2018

☀️ Test successful - status-travis
State: approved= try=True

@Zoxc
Copy link
Contributor Author

Zoxc commented Dec 25, 2018

@rust-timer build 203d99c0ed5ec7c17b4cab82a3995a30de4903ce

@rust-timer
Copy link
Collaborator

Success: Queued 203d99c0ed5ec7c17b4cab82a3995a30de4903ce with parent ad781a0, comparison URL.

@rust-timer
Copy link
Collaborator

Finished benchmarking try commit 203d99c0ed5ec7c17b4cab82a3995a30de4903ce

Zoxc
Zoxc commented Dec 25, 2018
View reviewed changes
src/librustc/ty/query/plumbing.rs

// Extract the diagnostic from the job
let diagnostics = mem::replace(&mut *self.job.diagnostics.lock(), Vec::new());
Copy link
Contributor Author

Choose a reason for hiding this comment

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

Note: Another lock gone here too.

@michaelwoerister
Copy link
Member

Thanks, @Zoxc! r=me with the conflicts resolved.

@Zoxc
Copy link
Contributor Author

Zoxc commented Jan 7, 2019

@bors r=michaelwoerister

@bors
Copy link
Contributor

bors commented Jan 7, 2019

📌 Commit a872c4f1ca4490a342beb6a569dffcac1aea57a4 has been approved by michaelwoerister

@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 Jan 7, 2019
@bors
Copy link
Contributor

bors commented Jan 8, 2019

☔ The latest upstream changes (presumably #57095) 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 Jan 8, 2019
@rust-highfive
Copy link
Collaborator

Your PR failed on Travis (raw log). Through arcane magic we have determined that the following fragments from the build log may contain information about the problem.

Click to expand the log.

I'm a bot! I can only do what humans tell me to, so if this was not helpful or you have suggestions for improvements, please ping or otherwise contact @TimNN. (Feature Requests)

@Zoxc
Copy link
Contributor Author

Zoxc commented Jan 8, 2019

@bors r=michaelwoerister

@bors
Copy link
Contributor

bors commented Jan 8, 2019

📌 Commit f21c084 has been approved by michaelwoerister

@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 Jan 8, 2019
@bors
Copy link
Contributor

bors commented Jan 10, 2019

⌛ Testing commit f21c084 with merge 0ffb6b65c87e9c6b588512508bcab13a82c7da5f...

@bors
Copy link
Contributor

bors commented Jan 10, 2019

💔 Test failed - status-appveyor

@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 Jan 10, 2019
@pietroalbini
Copy link
Member

@bors retry
AppVeyor... what's wrong with you today?

@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 Jan 10, 2019
Centril added a commit to Centril/rust that referenced this pull request Jan 13, 2019
@Centril
Rollup merge of rust-lang#57113 - Zoxc:query-perf10, r=michaelwoerister
45d3572 
Move diagnostics out from QueryJob and optimize for the case with no diagnostics

r? @michaelwoerister
@Centril Centril mentioned this pull request Jan 13, 2019
Merged
bors added a commit that referenced this pull request Jan 13, 2019
@bors
Auto merge of #57580 - Centril:rollup, r=Centril
9aee7ed 
Rollup of 4 pull requests

Successful merges:

 - #56874 (Simplify foreign type rendering.)
 - #57113 (Move diagnostics out from QueryJob and optimize for the case with no diagnostics)
 - #57366 (Point at match discriminant on type error in match arm pattern)
 - #57538 (librustc_mir: Fix ICE with slice patterns)

Failed merges:

 - #57381 (Tweak output of type mismatch between "then" and `else` `if` arms)

r? @ghost
@bors bors merged commit f21c084 into rust-lang:master Jan 14, 2019
@Zoxc Zoxc deleted the query-perf10 branch January 14, 2019 01:09
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers
No reviews
Assignees

@michaelwoerister michaelwoerister

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
No milestone
Development

Successfully merging this pull request may close these issues.
6 participants
@Zoxc @bors @rust-timer @michaelwoerister @rust-highfive @pietroalbini