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

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

Merged
merged 1 commit into from Jan 14, 2019

Conversation

Projects
None yet
6 participants
@Zoxc
Copy link
Contributor

Zoxc commented Dec 25, 2018

@Zoxc

This comment has been minimized.

Copy link
Contributor

Zoxc commented Dec 25, 2018

@bors try

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 25, 2018

⌛️ Trying commit a872c4f with merge 203d99c...

bors added a commit that referenced this pull request Dec 25, 2018

Auto merge of #57113 - Zoxc:query-perf10, r=<try>
Move diagnostics out from QueryJob and optimize for the case with no diagnostics

r? @michaelwoerister
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Dec 25, 2018

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

@Zoxc

This comment has been minimized.

Copy link
Contributor

Zoxc commented Dec 25, 2018

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 25, 2018

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

@rust-timer

This comment has been minimized.

Copy link

rust-timer commented Dec 25, 2018

Finished benchmarking try commit 203d99c


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

This comment has been minimized.

@Zoxc

Zoxc Dec 25, 2018

Contributor

Note: Another lock gone here too.

@michaelwoerister

This comment has been minimized.

Copy link
Contributor

michaelwoerister commented Jan 7, 2019

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

@Zoxc Zoxc force-pushed the Zoxc:query-perf10 branch from a872c4f to bcdcfae Jan 7, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor

Zoxc commented Jan 7, 2019

@bors r=michaelwoerister

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 7, 2019

📌 Commit a872c4f has been approved by michaelwoerister

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 8, 2019

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

@Zoxc Zoxc force-pushed the Zoxc:query-perf10 branch from bcdcfae to 4fe9349 Jan 8, 2019

@rust-highfive

This comment has been minimized.

Copy link
Collaborator

rust-highfive commented Jan 8, 2019

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 Zoxc force-pushed the Zoxc:query-perf10 branch from 4fe9349 to f21c084 Jan 8, 2019

@Zoxc

This comment has been minimized.

Copy link
Contributor

Zoxc commented Jan 8, 2019

@bors r=michaelwoerister

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 8, 2019

📌 Commit f21c084 has been approved by michaelwoerister

@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 10, 2019

⌛️ Testing commit f21c084 with merge 0ffb6b6...

bors added a commit that referenced this pull request Jan 10, 2019

Auto merge of #57113 - Zoxc:query-perf10, r=michaelwoerister
Move diagnostics out from QueryJob and optimize for the case with no diagnostics

r? @michaelwoerister
@bors

This comment has been minimized.

Copy link
Contributor

bors commented Jan 10, 2019

💔 Test failed - status-appveyor

@pietroalbini

This comment has been minimized.

Copy link
Member

pietroalbini commented Jan 10, 2019

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

Centril added a commit to Centril/rust that referenced this pull request Jan 13, 2019

Rollup merge of rust-lang#57113 - Zoxc:query-perf10, r=michaelwoerister
Move diagnostics out from QueryJob and optimize for the case with no diagnostics

r? @michaelwoerister

bors added a commit that referenced this pull request Jan 13, 2019

Auto merge of #57580 - Centril:rollup, r=Centril
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

1 of 2 checks passed

homu Test failed
Details
continuous-integration/travis-ci/pr The Travis CI build passed
Details

@Zoxc Zoxc deleted the Zoxc:query-perf10 branch Jan 14, 2019

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment